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

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

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 years, 11 months 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
« no previous file with comments | « no previous file | content/shell/minimal_ash.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 (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_MINIMAL_ASH_H_ 5 #ifndef CONTENT_SHELL_MINIMAL_ASH_H_
6 #define CONTENT_SHELL_MINIMAL_ASH_H_ 6 #define CONTENT_SHELL_MINIMAL_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 class FocusClient; 17 class FocusClient;
18 } 18 }
19 namespace test { 19 namespace test {
20 class TestActivationClient; 20 class TestActivationClient;
21 } 21 }
22 } 22 }
23 23
24 namespace gfx { 24 namespace gfx {
25 class Rect; 25 class Rect;
26 class Size;
26 } 27 }
27 28
28 namespace views { 29 namespace views {
29 namespace corewm { 30 namespace corewm {
30 class CompoundEventFilter; 31 class CompoundEventFilter;
31 class InputMethodEventFilter; 32 class InputMethodEventFilter;
32 } 33 }
33 } 34 }
34 35
35 namespace content { 36 namespace content {
36 37
37 // Creates a minimal environment for running the shell. We can't pull in all of 38 // 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 39 // ash here, but we can create attach several of the same things we'd find in
39 // the ash parts of the code. 40 // the ash parts of the code.
40 class MinimalAsh : public aura::client::StackingClient { 41 class MinimalAsh : public aura::client::StackingClient {
41 public: 42 public:
42 MinimalAsh(); 43 explicit MinimalAsh(const gfx::Size& default_window_size);
43 virtual ~MinimalAsh(); 44 virtual ~MinimalAsh();
44 45
45 // Overridden from client::StackingClient: 46 // Overridden from client::StackingClient:
46 virtual aura::Window* GetDefaultParent(aura::Window* context, 47 virtual aura::Window* GetDefaultParent(aura::Window* context,
47 aura::Window* window, 48 aura::Window* window,
48 const gfx::Rect& bounds) OVERRIDE; 49 const gfx::Rect& bounds) OVERRIDE;
49 50
50 private: 51 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
56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 57 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
57 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; 58 scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
58 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 59 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
59 scoped_ptr<aura::client::FocusClient> focus_client_; 60 scoped_ptr<aura::client::FocusClient> focus_client_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(MinimalAsh); 62 DISALLOW_COPY_AND_ASSIGN(MinimalAsh);
62 }; 63 };
63 64
64 } // namespace content; 65 } // namespace content;
65 66
66 #endif // CONTENT_SHELL_MINIMAL_ASH_H_ 67 #endif // CONTENT_SHELL_MINIMAL_ASH_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/minimal_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698