Index: content/shell/shell_stacking_client_ash.h |
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h |
index de169c4932a881199b8bd2d6d85318204cf590b2..bce0a4447a682513e22df14b911a1de2f5d47775 100644 |
--- a/content/shell/shell_stacking_client_ash.h |
+++ b/content/shell/shell_stacking_client_ash.h |
@@ -39,20 +39,20 @@ namespace content { |
// the ash parts of the code. |
class ShellStackingClientAsh : public aura::client::StackingClient { |
public: |
- ShellStackingClientAsh(); |
+ explicit ShellStackingClientAsh( |
+ scoped_ptr<aura::RootWindow> root_window); |
virtual ~ShellStackingClientAsh(); |
- |
// Overridden from client::StackingClient: |
virtual aura::Window* GetDefaultParent(aura::Window* context, |
aura::Window* window, |
const gfx::Rect& bounds) OVERRIDE; |
- |
private: |
+ void Init(); |
+ |
scoped_ptr<aura::RootWindow> root_window_; |
// Owned by RootWindow |
views::corewm::CompoundEventFilter* root_window_event_filter_; |
- |
scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; |
scoped_ptr<aura::test::TestActivationClient> test_activation_client_; |