Add setting to isolate zoom changes by default.

chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc

 // Copyright 2014 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/zoom/chrome_zoom_level_otr_delegate.h"
 
 #include "base/bind.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "components/zoom/zoom_event_manager.h"
 
 ChromeZoomLevelOTRDelegate::ChromeZoomLevelOTRDelegate(
-    base::WeakPtr<zoom::ZoomEventManager> zoom_event_manager)
-    : zoom_event_manager_(zoom_event_manager), host_zoom_map_(nullptr) {}
+    base::WeakPtr<zoom::ZoomEventManager> zoom_event_manager,
+    ChromeZoomLevelPrefs* parent_zoom_level_prefs)
+    : zoom_event_manager_(zoom_event_manager), host_zoom_map_(nullptr),
+      parent_zoom_level_prefs_(parent_zoom_level_prefs) {}
 
 ChromeZoomLevelOTRDelegate::~ChromeZoomLevelOTRDelegate() {
 }
 
+bool ChromeZoomLevelOTRDelegate::GetIsOriginScopePref() const {
+  if (!parent_zoom_level_prefs_)

[wjmaclean, 2017/01/19 21:09:05]

Is this null for Guest browsing mode? If so, perhaps include a comment to
explain that.

[Kevin McNee, 2017/01/25 16:41:52]

This is no longer used.

+    return true;
+
+  // Just use the setting of the parent profile.
+  return parent_zoom_level_prefs_->GetIsOriginScopePref();
+}
+
+std::unique_ptr<ChromeZoomLevelOTRDelegate::DefaultZoomScopeSubscription>
+ChromeZoomLevelOTRDelegate::RegisterDefaultZoomScopeCallback(
+    const base::Closure& callback) {
+  if (!parent_zoom_level_prefs_)
+    return nullptr;
+
+  return parent_zoom_level_prefs_->RegisterDefaultZoomScopeCallback(callback);
+}
+
 void ChromeZoomLevelOTRDelegate::InitHostZoomMap(
     content::HostZoomMap* host_zoom_map) {
   // This init function must be called only once.
   DCHECK(!host_zoom_map_);
   DCHECK(host_zoom_map);
   host_zoom_map_ = host_zoom_map;
 
   zoom_subscription_ = host_zoom_map_->AddZoomLevelChangedCallback(base::Bind(
       &ChromeZoomLevelOTRDelegate::OnZoomLevelChanged, base::Unretained(this)));
 }
 
 void ChromeZoomLevelOTRDelegate::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   // If there's a manager to aggregate ZoomLevelChanged events, pass this event
   // along. Since we already hold a subscription to our associated HostZoomMap,
   // we don't need to create a separate subscription for this.
   if (zoom_event_manager_)
     zoom_event_manager_->OnZoomLevelChanged(change);
 }