Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / signin / merge_session_load_page.cc

diff --git a/src/chrome/browser/chromeos/login/signin/merge_session_load_page.cc b/src/chrome/browser/chromeos/login/signin/merge_session_load_page.cc
index b1b686d..0f67d36 100644 (file)
--- a/src/chrome/browser/chromeos/login/signin/merge_session_load_page.cc
+++ b/src/chrome/browser/chromeos/login/signin/merge_session_load_page.cc
@@ -19,6 +19,7 @@
 #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"
@@ -90,7 +91,6 @@ std::string MergeSessionLoadPage::GetHTMLContents() {
   bool rtl = base::i18n::IsRTL();
   strings.SetString("textdirection", rtl ? "rtl" : "ltr");
 
-  webui::UseVersion2 version2;
   base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_MERGE_SESSION_LOAD_HTML));
@@ -101,7 +101,8 @@ 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() {