Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / apps / chrome_app_delegate.cc

diff --git a/src/chrome/browser/ui/apps/chrome_app_delegate.cc b/src/chrome/browser/ui/apps/chrome_app_delegate.cc
index 06eea7b..8d636f4 100644 (file)
--- a/src/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/src/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -6,6 +6,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
+#include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ -17,6 +18,7 @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
@@ -164,6 +166,10 @@ void ChromeAppDelegate::InitWebContents(content::WebContents* web_contents) {
   printing::PrintViewManagerBasic::CreateForWebContents(web_contents);
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
+
+  // Kiosk app supports zooming.
+  if (chrome::IsRunningInForcedAppMode())
+    ZoomController::CreateForWebContents(web_contents);
 }
 
 content::WebContents* ChromeAppDelegate::OpenURLFromTab(