| Index: chrome/browser/chrome_page_zoom.cc
|
| diff --git a/chrome/browser/chrome_page_zoom.cc b/chrome/browser/chrome_page_zoom.cc
|
| index cbd8c56f7206e5b0ad57af40b805dad4832e1872..e18692bfece6ce19d45a769900db42f52448516e 100644
|
| --- a/chrome/browser/chrome_page_zoom.cc
|
| +++ b/chrome/browser/chrome_page_zoom.cc
|
| @@ -8,6 +8,9 @@
|
| #include <cmath>
|
|
|
| #include "chrome/browser/chrome_page_zoom_constants.h"
|
| +#include "chrome/browser/prefs/pref_service.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/common/pref_names.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -63,16 +66,17 @@ std::vector<double> PresetZoomLevels(double custom_level) {
|
|
|
| void Zoom(content::WebContents* web_contents, content::PageZoom zoom) {
|
| content::RenderViewHost* host = web_contents->GetRenderViewHost();
|
| + double current_zoom_level = web_contents->GetZoomLevel();
|
| + double default_zoom_level =
|
| + Profile::FromBrowserContext(web_contents->GetBrowserContext())->
|
| + GetPrefs()->GetDouble(prefs::kDefaultZoomLevel);
|
| +
|
| if (zoom == content::PAGE_ZOOM_RESET) {
|
| - host->SetZoomLevel(0);
|
| + host->SetZoomLevel(default_zoom_level);
|
| content::RecordAction(UserMetricsAction("ZoomNormal"));
|
| return;
|
| }
|
|
|
| - double current_zoom_level = web_contents->GetZoomLevel();
|
| - double default_zoom_level =
|
| - web_contents->GetMutableRendererPrefs()->default_zoom_level;
|
| -
|
| // Generate a vector of zoom levels from an array of known presets along with
|
| // the default level added if necessary.
|
| std::vector<double> zoom_levels = PresetZoomLevels(default_zoom_level);
|
|
|