Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / test / test_shell_delegate.h

diff --git a/src/ash/test/test_shell_delegate.h b/src/ash/test/test_shell_delegate.h
index 9e610b6..d92f80d 100644 (file)
--- a/src/ash/test/test_shell_delegate.h
+++ b/src/ash/test/test_shell_delegate.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "ash/media_delegate.h"
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ -34,11 +35,17 @@ class TestShellDelegate : public ShellDelegate {
   virtual bool IsIncognitoAllowed() const OVERRIDE;
   virtual bool IsMultiProfilesEnabled() 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(
+      VirtualKeyboardStateObserver* observer) OVERRIDE;
+  virtual void RemoveVirtualKeyboardStateObserver(
+      VirtualKeyboardStateObserver* observer) OVERRIDE;
   virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
   virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
@@ -52,13 +59,16 @@ class TestShellDelegate : public ShellDelegate {
       aura::Window* root,
       ash::ShelfItemDelegate* item_delegate,
       ash::ShelfItem* item) OVERRIDE;
-  virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
   virtual GPUSupport* CreateGPUSupport() OVERRIDE;
   virtual base::string16 GetProductName() const OVERRIDE;
 
   int num_exit_requests() const { return num_exit_requests_; }
 
-  TestSessionStateDelegate* test_session_state_delegate();
+  TestSessionStateDelegate* test_session_state_delegate() {
+    return test_session_state_delegate_;
+  }
+
+  void SetMediaCaptureState(MediaCaptureState state);
 
  private:
   int num_exit_requests_;