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

Side by Side Diff: ui/shell/minimal_shell.h

Issue 36473003: Rename StackingClient -> WindowTreeClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: done. Created 7 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
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/shell/minimal_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 UI_SHELL_MINIMAL_SHELL_H_ 5 #ifndef UI_SHELL_MINIMAL_SHELL_H_
6 #define UI_SHELL_MINIMAL_SHELL_H_ 6 #define UI_SHELL_MINIMAL_SHELL_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/window_tree_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 DefaultActivationClient; 16 class DefaultActivationClient;
17 class DefaultCaptureClient; 17 class DefaultCaptureClient;
18 class FocusClient; 18 class FocusClient;
19 } // class client 19 } // class client
20 } // class aura 20 } // class aura
21 21
22 namespace gfx { 22 namespace gfx {
23 class Rect; 23 class Rect;
24 class Size; 24 class Size;
25 } // class gfx 25 } // class gfx
26 26
27 namespace views { 27 namespace views {
28 namespace corewm { 28 namespace corewm {
29 class CompoundEventFilter; 29 class CompoundEventFilter;
30 class InputMethodEventFilter; 30 class InputMethodEventFilter;
31 } // corewm 31 } // corewm
32 } // views 32 } // views
33 33
34 namespace shell { 34 namespace shell {
35 35
36 // 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
37 // 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
38 // the ash parts of the code. 38 // the ash parts of the code.
39 class MinimalShell : public aura::client::StackingClient { 39 class MinimalShell : public aura::client::WindowTreeClient {
40 public: 40 public:
41 explicit MinimalShell(const gfx::Size& default_window_size); 41 explicit MinimalShell(const gfx::Size& default_window_size);
42 virtual ~MinimalShell(); 42 virtual ~MinimalShell();
43 43
44 aura::RootWindow* root_window() { return root_window_.get(); } 44 aura::RootWindow* root_window() { return root_window_.get(); }
45 45
46 // Overridden from client::StackingClient: 46 // Overridden from client::WindowTreeClient:
47 virtual aura::Window* GetDefaultParent(aura::Window* context, 47 virtual aura::Window* GetDefaultParent(aura::Window* context,
48 aura::Window* window, 48 aura::Window* window,
49 const gfx::Rect& bounds) OVERRIDE; 49 const gfx::Rect& bounds) OVERRIDE;
50 50
51 private: 51 private:
52 scoped_ptr<aura::RootWindow> root_window_; 52 scoped_ptr<aura::RootWindow> root_window_;
53 53
54 // Owned by RootWindow 54 // Owned by RootWindow
55 views::corewm::CompoundEventFilter* root_window_event_filter_; 55 views::corewm::CompoundEventFilter* root_window_event_filter_;
56 56
57 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 57 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
58 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; 58 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
59 scoped_ptr<aura::client::DefaultActivationClient> activation_client_; 59 scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
60 scoped_ptr<aura::client::FocusClient> focus_client_; 60 scoped_ptr<aura::client::FocusClient> focus_client_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(MinimalShell); 62 DISALLOW_COPY_AND_ASSIGN(MinimalShell);
63 }; 63 };
64 64
65 } // namespace shell 65 } // namespace shell
66 66
67 #endif // UI_SHELL_MINIMAL_SHELL_H_ 67 #endif // UI_SHELL_MINIMAL_SHELL_H_
OLDNEW
« no previous file with comments | « ui/aura/window_unittest.cc ('k') | ui/shell/minimal_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698