Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / constrained_web_dialog_delegate_base.cc

diff --git a/src/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/src/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
index a2b05b9..2034190 100644 (file)
--- a/src/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
+++ b/src/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
@@ -9,8 +9,10 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/renderer_preferences.h"
 #include "ipc/ipc_message.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
@@ -32,15 +34,18 @@ ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase(
   CHECK(delegate);
   web_contents_.reset(
       WebContents::Create(WebContents::CreateParams(browser_context)));
+  ZoomController::CreateForWebContents(web_contents_.get());
   if (tab_delegate) {
     override_tab_delegate_.reset(tab_delegate);
     web_contents_->SetDelegate(tab_delegate);
   } else {
     web_contents_->SetDelegate(this);
   }
+  content::RendererPreferences* prefs =
+      web_contents_->GetMutableRendererPrefs();
   renderer_preferences_util::UpdateFromSystemSettings(
-      web_contents_->GetMutableRendererPrefs(),
-      Profile::FromBrowserContext(browser_context));
+      prefs, Profile::FromBrowserContext(browser_context), web_contents_.get());
+
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 
   // Set |this| as a delegate so the ConstrainedWebDialogUI can retrieve it.