Index: ui/views/widget/desktop_root_window_host_win.h |
=================================================================== |
--- ui/views/widget/desktop_root_window_host_win.h (revision 156204) |
+++ ui/views/widget/desktop_root_window_host_win.h (working copy) |
@@ -9,7 +9,14 @@ |
#include "ui/views/widget/desktop_root_window_host.h" |
#include "ui/views/win/hwnd_message_handler_delegate.h" |
+namespace aura { |
+class DesktopActivationClient; |
+class DesktopDispatcherClient; |
+class FocusManager; |
+} |
+ |
namespace views { |
+class DesktopCaptureClient; |
class HWNDMessageHandler; |
class DesktopRootWindowHostWin : public DesktopRootWindowHost, |
@@ -25,7 +32,12 @@ |
// Overridden from DesktopRootWindowHost: |
virtual void Init(aura::Window* content_window, |
const Widget::InitParams& params) OVERRIDE; |
+ virtual void Close() OVERRIDE; |
+ virtual void CloseNow() OVERRIDE; |
+ virtual aura::RootWindowHost* AsRootWindowHost() OVERRIDE; |
virtual void ShowWindowWithState(ui::WindowShowState show_state) OVERRIDE; |
+ virtual bool IsVisible() const OVERRIDE; |
+ virtual gfx::Rect GetClientAreaBoundsInScreen() const OVERRIDE; |
// Overridden from aura::RootWindowHost: |
virtual aura::RootWindow* GetRootWindow() OVERRIDE; |
@@ -128,6 +140,10 @@ |
scoped_ptr<aura::RootWindow> root_window_; |
scoped_ptr<HWNDMessageHandler> message_handler_; |
+ scoped_ptr<DesktopCaptureClient> capture_client_; |
+ scoped_ptr<aura::DesktopActivationClient> activation_client_; |
+ scoped_ptr<aura::DesktopDispatcherClient> dispatcher_client_; |
+ scoped_ptr<aura::FocusManager> focus_manager_; |
// TODO(beng): Consider providing an interface to DesktopNativeWidgetAura |
// instead of providing this route back to Widget. |