Add setting to isolate zoom changes by default.

chrome/browser/ui/webui/options/content_settings_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/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 462 matching lines @@
     // USB devices.
     {"usbDevicesHeader", IDS_USB_DEVICES_HEADER_AND_TAB_LABEL},
     {"usbDevicesManage", IDS_USB_DEVICES_MANAGE_BUTTON},
     // Background sync.
     {"backgroundSyncHeader", IDS_BACKGROUND_SYNC_HEADER},
     {"backgroundSyncAllow", IDS_BACKGROUND_SYNC_ALLOW_RADIO},
     {"backgroundSyncBlock", IDS_BACKGROUND_SYNC_BLOCK_RADIO},
     // Zoom levels.
     {"zoomlevelsHeader", IDS_ZOOMLEVELS_HEADER_AND_TAB_LABEL},
     {"zoomLevelsManage", IDS_ZOOMLEVELS_MANAGE_BUTTON},
+    {"zoomLevelsIgnoredExplanation", IDS_ZOOMLEVELS_IGNORED_LABEL},
     // PDF Plugin filter.
     {"pdfTabLabel", IDS_PDF_TAB_LABEL},
     {"pdfEnable", IDS_PDF_ENABLE_CHECKBOX},
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 
   // TODO(tommycli): When the HTML5 By Default feature flag is on, we want to
   // display strings that begin with "Ask...", even though the setting remains
   // DETECT. Once this feature is finalized, then we migrate the setting to ASK.
@@ skipping 112 matching lines @@
   // Here we only subscribe to the HostZoomMap for the default storage partition
   // since we don't allow the user to manage the zoom levels for apps.
   // We're only interested in zoom-levels that are persisted, since the user
   // is given the opportunity to view/delete these in the content-settings page.
   host_zoom_map_subscription_ =
       content::HostZoomMap::GetDefaultForBrowserContext(context)
           ->AddZoomLevelChangedCallback(
               base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
                          base::Unretained(this)));
 
+  Profile* profile = Profile::FromWebUI(web_ui());
+
+  ChromeZoomLevelPrefs* zoom_level_prefs = profile->GetZoomLevelPrefs();
+  if (zoom_level_prefs) {
+    default_zoom_scope_subscription_ =
+        zoom_level_prefs->RegisterDefaultZoomScopeCallback(
+            base::Bind(&ContentSettingsHandler::OnZoomScopeChanged,
+                       base::Unretained(this)));
+  }
+
   flash_settings_manager_.reset(new PepperFlashSettingsManager(this, context));
 
-  Profile* profile = Profile::FromWebUI(web_ui());
   observer_.Add(HostContentSettingsMapFactory::GetForProfile(profile));
   if (profile->HasOffTheRecordProfile()) {
     auto* map = HostContentSettingsMapFactory::GetForProfile(
         profile->GetOffTheRecordProfile());
     if (!observer_.IsObserving(map))
       observer_.Add(map);
   }
 }
 
 void ContentSettingsHandler::InitializePage() {
   media_settings_.reset(new MediaSettingsInfo());
   RefreshFlashMediaSettings();
 
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
   UpdateAllChooserExceptionsViewsFromModel();
   UpdateProtectedContentExceptionsButton();
+  UpdateZoomScopeExplanationVisibility();
 }
 
 void ContentSettingsHandler::OnContentSettingChanged(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     std::string resource_identifier) {
   const ContentSettingsDetails details(
       primary_pattern, secondary_pattern, content_type, resource_identifier);
   // TODO(estade): we pretend update_all() is always true.
@@ skipping 752 matching lines @@
     RefreshFlashMediaSettings();
   else
     media_settings_->forFlash().initialized = false;
 }
 
 void ContentSettingsHandler::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomLevelsExceptionsView();
 }
 
+void ContentSettingsHandler::OnZoomScopeChanged() {
+  UpdateZoomScopeExplanationVisibility();
+}
+
 void ContentSettingsHandler::ShowFlashMediaLink(
     LinkType link_type, ContentSettingsType content_type, bool show) {
   MediaSettingsInfo::ForOneType& settings =
       media_settings_->forType(content_type);
 
   bool& show_link = link_type == DEFAULT_SETTING ?
       settings.show_flash_default_link :
       settings.show_flash_exceptions_link;
 
   if (show_link != show) {
@@ skipping 73 matching lines @@
 #endif
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
+void ContentSettingsHandler::UpdateZoomScopeExplanationVisibility() {
+  ChromeZoomLevelPrefs* zoom_level_prefs =
+      Profile::FromWebUI(web_ui())->GetZoomLevelPrefs();
+  base::FundamentalValue per_tab_scope(
+      !(zoom_level_prefs
+            ? zoom_level_prefs->GetZoomScopeIsPerOriginPref()
+            : ChromeZoomLevelPrefs::kZoomScopeSettingDefault));
+
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "ContentSettings.showZoomScopeExplanation", per_tab_scope);
+}
+
 }  // namespace options