Add setting to isolate zoom changes by default.

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 267 matching lines @@
     { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE },
     { "childLabel", IDS_PROFILES_LIST_CHILD_LABEL },
     { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
     { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL },
     { "defaultBrowserUnknown",
       IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN, IDS_PRODUCT_NAME },
     { "defaultBrowserUseAsDefault", IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT },
     { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
     { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
     { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
+    { "defaultZoomScopeLabel",
+      IDS_OPTIONS_DEFAULT_ZOOM_SCOPE_LABEL },
     { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
     { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK },
     { "doNotTrackConfirmDisable",
       IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE },
     { "doNotTrackConfirmEnable",
       IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE },
     { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT },
     { "downloadLocationAskForSaveLocation",
       IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION },
     { "downloadLocationBrowseTitle",
@@ skipping 546 matching lines @@
       base::Bind(&BrowserOptionsHandler::HandleAutoOpenButton,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "defaultFontSizeAction",
       base::Bind(&BrowserOptionsHandler::HandleDefaultFontSize,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "defaultZoomFactorAction",
       base::Bind(&BrowserOptionsHandler::HandleDefaultZoomFactor,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "defaultZoomScopeAction",
+      base::Bind(&BrowserOptionsHandler::HandleDefaultZoomScope,
+                 base::Unretained(this)));
 #if defined(OS_WIN) || defined(OS_MACOSX)
   web_ui()->RegisterMessageCallback(
       "showManageSSLCertificates",
       base::Bind(&BrowserOptionsHandler::ShowManageSSLCertificates,
                  base::Unretained(this)));
 #endif
 #if defined(OS_CHROMEOS)
   web_ui()->RegisterMessageCallback(
       "openWallpaperManager",
       base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager,
@@ skipping 114 matching lines @@
 }
 
 void BrowserOptionsHandler::PageLoadStarted() {
   page_initialized_ = false;
 }
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
   ChromeZoomLevelPrefs* zoom_level_prefs = profile->GetZoomLevelPrefs();
-  // Only regular profiles are able to edit default zoom level, or delete per-
-  // host zoom levels, via the settings menu. We only require a zoom_level_prefs
-  // if the profile is able to change these preference types.
+  // Only regular profiles are able to edit default zoom level, default zoom
+  // scope, or delete per-host zoom levels, via the settings menu. We only
+  // require a zoom_level_prefs if the profile is able to change these
+  // preference types.
   DCHECK(zoom_level_prefs ||
          profile->GetProfileType() != Profile::REGULAR_PROFILE);
   if (zoom_level_prefs) {
     default_zoom_level_subscription_ =
         zoom_level_prefs->RegisterDefaultZoomLevelCallback(
             base::Bind(&BrowserOptionsHandler::SetupPageZoomSelector,
                        base::Unretained(this)));
+    default_zoom_scope_subscription_ =
+        zoom_level_prefs->RegisterDefaultZoomScopeCallback(
+            base::Bind(&BrowserOptionsHandler::SetupZoomScopeCheckbox,
+                       base::Unretained(this)));
   }
 
   g_browser_process->policy_service()->AddObserver(
       policy::POLICY_DOMAIN_CHROME, this);
 
   g_browser_process->profile_manager()->
       GetProfileAttributesStorage().AddObserver(this);
 
   browser_sync::ProfileSyncService* sync_service(
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
@@ skipping 132 matching lines @@
   UpdateSyncState();
 #if !defined(OS_CHROMEOS)
   UpdateDefaultBrowserState();
 #endif
 
   SetupMetricsReportingSettingVisibility();
   SetupMetricsReportingCheckbox();
   SetupNetworkPredictionControl();
   SetupFontSizeSelector();
   SetupPageZoomSelector();
+  SetupZoomScopeCheckbox();
   SetupAutoOpenFileTypes();
   SetupProxySettingsSection();
   SetupManagingSupervisedUsers();
   SetupEasyUnlock();
   SetupExtensionControlledIndicators();
   SetupSafeBrowsingExtendedReporting();
 
 #if defined(OS_CHROMEOS)
   SetupAccessibilityFeatures();
   policy::BrowserPolicyConnectorChromeOS* connector =
@@ skipping 575 matching lines @@
   double zoom_factor;
   if (ExtractDoubleValue(args, &zoom_factor)) {
     ChromeZoomLevelPrefs* zoom_level_prefs =
         Profile::FromWebUI(web_ui())->GetZoomLevelPrefs();
     DCHECK(zoom_level_prefs);
     zoom_level_prefs->SetDefaultZoomLevelPref(
         content::ZoomFactorToZoomLevel(zoom_factor));
   }
 }
 
+void BrowserOptionsHandler::HandleDefaultZoomScope(
+    const base::ListValue* args) {
+  bool checked;
+  if (args->GetBoolean(0, &checked)) {
+    ChromeZoomLevelPrefs* zoom_level_prefs =
+        Profile::FromWebUI(web_ui())->GetZoomLevelPrefs();
+    DCHECK(zoom_level_prefs);
+    zoom_level_prefs->SetZoomScopeIsPerOriginPref(checked);
+  }
+}
+
 void BrowserOptionsHandler::HandleRestartBrowser(const base::ListValue* args) {
   chrome::AttemptRestart();
 }
 
 void BrowserOptionsHandler::HandleRequestProfilesInfo(
     const base::ListValue* args) {
   SendProfilesInfo();
 }
 
 #if !defined(OS_CHROMEOS)
@@ skipping 387 matching lines @@
     option->AppendDouble(factor);
     bool selected = content::ZoomValuesEqual(factor, default_zoom_factor);
     option->AppendBoolean(selected);
     zoom_factors_value.Append(std::move(option));
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("BrowserOptions.setupPageZoomSelector",
                                          zoom_factors_value);
 }
 
+void BrowserOptionsHandler::SetupZoomScopeCheckbox() {
+  ChromeZoomLevelPrefs* zoom_level_prefs =
+      Profile::FromWebUI(web_ui())->GetZoomLevelPrefs();
+  base::FundamentalValue is_per_origin(
+      zoom_level_prefs
+          ? zoom_level_prefs->GetZoomScopeIsPerOriginPref()
+          : ChromeZoomLevelPrefs::kZoomScopeSettingDefault);
+
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "BrowserOptions.setupZoomScopeCheckbox", is_per_origin);
+}
+
 void BrowserOptionsHandler::SetupAutoOpenFileTypes() {
   // Set the hidden state for the AutoOpenFileTypesResetToDefault button.
   // We show the button if the user has any auto-open file types registered.
   DownloadManager* manager = BrowserContext::GetDownloadManager(
       web_ui()->GetWebContents()->GetBrowserContext());
   bool display = manager &&
       DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed();
   base::FundamentalValue value(display);
   web_ui()->CallJavascriptFunctionUnsafe(
       "BrowserOptions.setAutoOpenFileTypesDisplayed", value);
@@ skipping 153 matching lines @@
 
 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
 #if defined(OS_CHROMEOS)
   return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
 #else
   return true;
 #endif
 }
 
 }  // namespace options