Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

chrome/browser/chromeos/login/signin/merge_session_load_page.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/chromeos/login/signin/merge_session_load_page.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
@@ skipping 61 matching lines @@
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_MERGE_SESSION_LOAD_HTML));
   return webui::GetI18nTemplateHtml(html, &strings);
 }
 
 void MergeSessionLoadPage::OverrideRendererPrefs(
       content::RendererPreferences* prefs) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
-  renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);
+  renderer_preferences_util::UpdateFromSystemSettings(
+      prefs, profile, web_contents_);
 }
 
 void MergeSessionLoadPage::OnProceed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   proceeded_ = true;
   NotifyBlockingPageComplete();
 }
 
 void MergeSessionLoadPage::OnDontProceed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 49 matching lines @@
                   " NOT " : "")
            << " be blocking now, "
            << state;
   if (!manager->ShouldBlockTabLoading()) {
     manager->RemoveObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 }  // namespace chromeos