Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/ui/ash/chrome_shell_delegate.h b/src/chrome/browser/ui/ash/chrome_shell_delegate.h
index c1d52a4..577b28e 100644 (file)
--- a/src/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/src/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -12,6 +12,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -50,11 +51,17 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   virtual bool IsMultiProfilesEnabled() const OVERRIDE;
   virtual bool IsIncognitoAllowed() const OVERRIDE;
   virtual bool IsRunningInForcedAppMode() const OVERRIDE;
+  virtual bool IsMultiAccountEnabled() const OVERRIDE;
   virtual void PreInit() OVERRIDE;
   virtual void PreShutdown() OVERRIDE;
   virtual void Exit() OVERRIDE;
   virtual keyboard::KeyboardControllerProxy*
       CreateKeyboardControllerProxy() OVERRIDE;
+  virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;
+  virtual void AddVirtualKeyboardStateObserver(
+      ash::VirtualKeyboardStateObserver* observer) OVERRIDE;
+  virtual void RemoveVirtualKeyboardStateObserver(
+      ash::VirtualKeyboardStateObserver* observer) OVERRIDE;
   virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
   virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual ash::ShelfDelegate* CreateShelfDelegate(
@@ -69,7 +76,6 @@ class ChromeShellDelegate : public ash::ShellDelegate,
       aura::Window* root,
       ash::ShelfItemDelegate* item_delegate,
       ash::ShelfItem* item) OVERRIDE;
-  virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
   virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;
   virtual base::string16 GetProductName() const OVERRIDE;
 
@@ -87,6 +93,8 @@ class ChromeShellDelegate : public ash::ShellDelegate,
 
   ChromeLauncherController* shelf_delegate_;
 
+  ObserverList<ash::VirtualKeyboardStateObserver> keyboard_state_observer_list_;
+
 #if defined(OS_CHROMEOS)
   scoped_ptr<chromeos::DisplayConfigurationObserver>
       display_configuration_observer_;