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

chrome/browser/chromeos/login/ui/webui_login_view.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/ui/webui_login_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/render_messages.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "content/public/common/renderer_preferences.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 using content::NativeWebKeyboardEvent;
 using content::RenderViewHost;
 using content::WebContents;
 using web_modal::WebContentsModalDialogManager;
@@ skipping 142 matching lines @@
   WebContentsModalDialogManager::FromWebContents(web_contents)->
       SetDelegate(this);
   if (!popup_manager_.get())
     popup_manager_.reset(new web_modal::PopupManager(this));
   popup_manager_->RegisterWith(web_contents);
 
   web_contents->SetDelegate(this);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents);
   WebContentsObserver::Observe(web_contents);
-  renderer_preferences_util::UpdateFromSystemSettings(
-      web_contents->GetMutableRendererPrefs(),
-      signin_profile);
+  content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
+  renderer_preferences_util::UpdateFromSystemSettings(prefs, signin_profile);
+  // TODO(wjmaclean): Convert this to use the HostZoomMap for the WebContents
+  // when HostZoomMap moves to StoragePartition.
+  prefs->default_zoom_level = content::HostZoomMap::GetDefaultForBrowserContext(
+                                  signin_profile)->GetDefaultZoomLevel();
 }
 
 const char* WebUILoginView::GetClassName() const {
   return kViewClassName;
 }
 
 void WebUILoginView::RequestFocus() {
   webui_login_->RequestFocus();
 }
 
@@ skipping 259 matching lines @@
   webui_visible_ = true;
 }
 
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos