Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: content/shell/shell_stacking_client_ash.h

Issue 11275139: Move ui\aura\shared to ui\views\corewm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 11
12 namespace aura { 12 namespace aura {
13 class RootWindow; 13 class RootWindow;
14 class Window; 14 class Window;
15 namespace client { 15 namespace client {
16 class DefaultCaptureClient; 16 class DefaultCaptureClient;
17 } 17 }
18 namespace shared {
19 class CompoundEventFilter;
20 class InputMethodEventFilter;
21 }
22 namespace test { 18 namespace test {
23 class TestActivationClient; 19 class TestActivationClient;
24 } 20 }
25 } 21 }
26 22
27 namespace gfx { 23 namespace gfx {
28 class Rect; 24 class Rect;
29 } 25 }
30 26
27 namespace views {
28 namespace corewm {
29 class CompoundEventFilter;
30 class InputMethodEventFilter;
31 }
32 }
33
31 namespace content { 34 namespace content {
32 35
33 // Creates a minimal environment for running the shell. We can't pull in all of 36 // Creates a minimal environment for running the shell. We can't pull in all of
34 // ash here, but we can create attach several of the same things we'd find in 37 // ash here, but we can create attach several of the same things we'd find in
35 // the ash parts of the code. 38 // the ash parts of the code.
36 class ShellStackingClientAsh : public aura::client::StackingClient { 39 class ShellStackingClientAsh : public aura::client::StackingClient {
37 public: 40 public:
38 ShellStackingClientAsh(); 41 ShellStackingClientAsh();
39 virtual ~ShellStackingClientAsh(); 42 virtual ~ShellStackingClientAsh();
40 43
41 // Overridden from client::StackingClient: 44 // Overridden from client::StackingClient:
42 virtual aura::Window* GetDefaultParent(aura::Window* window, 45 virtual aura::Window* GetDefaultParent(aura::Window* window,
43 const gfx::Rect& bounds) OVERRIDE; 46 const gfx::Rect& bounds) OVERRIDE;
44 47
45 private: 48 private:
46 scoped_ptr<aura::RootWindow> root_window_; 49 scoped_ptr<aura::RootWindow> root_window_;
47 50
48 // Owned by RootWindow 51 // Owned by RootWindow
49 aura::shared::CompoundEventFilter* root_window_event_filter_; 52 views::corewm::CompoundEventFilter* root_window_event_filter_;
50 53
51 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 54 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
52 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; 55 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
53 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 56 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
54 57
55 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh); 58 DISALLOW_COPY_AND_ASSIGN(ShellStackingClientAsh);
56 }; 59 };
57 60
58 } // namespace content; 61 } // namespace content;
59 62
60 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_ 63 #endif // CONTENT_SHELL_SHELL_STACKING_CLIENT_ASH_H_
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698