Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / chrome_shell_delegate.cc

diff --git a/src/chrome/browser/ui/ash/chrome_shell_delegate.cc b/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
index bfae310..5fe0574 100644 (file)
--- a/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -4,9 +4,10 @@
 
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
-#include "ash/host/root_window_host_factory.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
+#include "ash/content_support/gpu_support_impl.h"
+#include "ash/host/window_tree_host_factory.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
@@ -131,7 +132,7 @@ aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
     aura::Window* root,
     ash::ShelfItemDelegate* item_delegate,
-    ash::LauncherItem* item) {
+    ash::ShelfItem* item) {
   DCHECK(shelf_delegate_);
   // Don't show context menu for exclusive app runtime mode.
   if (chrome::IsRunningInAppMode())
@@ -147,6 +148,11 @@ ash::WindowTreeHostFactory* ChromeShellDelegate::CreateWindowTreeHostFactory() {
   return ash::WindowTreeHostFactory::Create();
 }
 
+ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {
+  // Chrome uses real GPU support.
+  return new ash::GPUSupportImpl;
+}
+
 base::string16 ChromeShellDelegate::GetProductName() const {
   return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 }