| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ | 5 #ifndef CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ |
| 6 #define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ | 6 #define CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/aura/client/stacking_client.h" | 10 #include "ui/aura/client/stacking_client.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 } | 32 } |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace content { | 35 namespace content { |
| 36 | 36 |
| 37 // Creates a minimal environment for running the shell. We can't pull in all of | 37 // Creates a minimal environment for running the shell. We can't pull in all of |
| 38 // ash here, but we can create attach several of the same things we'd find in | 38 // ash here, but we can create attach several of the same things we'd find in |
| 39 // the ash parts of the code. | 39 // the ash parts of the code. |
| 40 class ShellStackingClientAsh : public aura::client::StackingClient { | 40 class ShellStackingClientAsh : public aura::client::StackingClient { |
| 41 public: | 41 public: |
| 42 ShellStackingClientAsh(); | 42 explicit ShellStackingClientAsh( |
| 43 scoped_ptr<aura::RootWindow> root_window); |
| 43 virtual ~ShellStackingClientAsh(); | 44 virtual ~ShellStackingClientAsh(); |
| 44 | |
| 45 // Overridden from client::StackingClient: | 45 // Overridden from client::StackingClient: |
| 46 virtual aura::Window* GetDefaultParent(aura::Window* context, | 46 virtual aura::Window* GetDefaultParent(aura::Window* context, |
| 47 aura::Window* window, | 47 aura::Window* window, |
| 48 const gfx::Rect& bounds) OVERRIDE; | 48 const gfx::Rect& bounds) OVERRIDE; |
| 49 private: |
| 50 void Init(); |
| 49 | 51 |
| 50 private: | |
| 51 scoped_ptr<aura::RootWindow> root_window_; | 52 scoped_ptr<aura::RootWindow> root_window_; |
| 52 | 53 |
| 53 // Owned by RootWindow | 54 // Owned by RootWindow |
| 54 views::corewm::CompoundEventFilter* root_window_event_filter_; | 55 views::corewm::CompoundEventFilter* root_window_event_filter_; |
| 55 | |
| 56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 57 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; | 57 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; |
| 58 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; | 58 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; |
| 59 scoped_ptr<aura::client::FocusClient> focus_client_; | 59 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 60 | 60 |
| 61 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh); | 61 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace content; | 64 } // namespace content; |
| 65 | 65 |
| 66 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ | 66 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ |
| OLD | NEW |