Add setting to isolate zoom changes by default.

chrome/browser/ui/webui/options/content_settings_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/values.h"
 #include "chrome/browser/pepper_flash_settings_manager.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class HostContentSettingsMap;
 class Profile;
@@ skipping 219 matching lines @@
 
   // Gets the ProtocolHandlerRegistry for the normal profile.
   ProtocolHandlerRegistry* GetProtocolHandlerRegistry();
 
   void RefreshFlashMediaSettings();
 
   void OnPepperFlashPrefChanged();
 
   // content::HostZoomMap subscription.
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
+  // ChromeZoomLevelPrefs::DefaultZoomScopeSubscription subscription.
+  void OnZoomScopeChanged();
 
   void ShowFlashMediaLink(
       LinkType link_type, ContentSettingsType content_type, bool show);
 
   void UpdateFlashMediaLinksVisibility(ContentSettingsType type);
 
   void UpdateMediaDeviceDropdownVisibility(ContentSettingsType type);
 
   void UpdateProtectedContentExceptionsButton();
 
+  void UpdateZoomScopeExplanationVisibility();
+
   // Member variables ---------------------------------------------------------
 
   content::NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
   std::unique_ptr<PepperFlashSettingsManager> flash_settings_manager_;
   std::unique_ptr<MediaSettingsInfo> media_settings_;
   std::unique_ptr<content::HostZoomMap::Subscription>
       host_zoom_map_subscription_;
   std::unique_ptr<content::HostZoomMap::Subscription>
       signin_host_zoom_map_subscription_;
+  std::unique_ptr<ChromeZoomLevelPrefs::DefaultZoomScopeSubscription>
+      default_zoom_scope_subscription_;
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_