Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ash / shell / shell_delegate_impl.cc

diff --git a/src/ash/shell/shell_delegate_impl.cc b/src/ash/shell/shell_delegate_impl.cc
index 20e8fde..3abcdab 100644 (file)
--- a/src/ash/shell/shell_delegate_impl.cc
+++ b/src/ash/shell/shell_delegate_impl.cc
@@ -8,7 +8,8 @@
 #include "ash/caps_lock_delegate_stub.h"
 #include "ash/default_accessibility_delegate.h"
 #include "ash/default_user_wallpaper_delegate.h"
-#include "ash/host/root_window_host_factory.h"
+#include "ash/gpu_support_stub.h"
+#include "ash/host/window_tree_host_factory.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session_state_delegate.h"
@@ -161,7 +162,7 @@ aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
     aura::Window* root,
     ash::ShelfItemDelegate* item_delegate,
-    ash::LauncherItem* item) {
+    ash::ShelfItem* item) {
   return new ContextMenu(root);
 }
 
@@ -169,6 +170,11 @@ WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() {
   return WindowTreeHostFactory::Create();
 }
 
+GPUSupport* ShellDelegateImpl::CreateGPUSupport() {
+  // Real GPU support depends on src/content, so just use a stub.
+  return new GPUSupportStub;
+}
+
 base::string16 ShellDelegateImpl::GetProductName() const {
   return base::string16();
 }