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 #include "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "third_party/skia/include/core/SkXfermode.h" | 10 #include "third_party/skia/include/core/SkXfermode.h" |
11 #include "ui/aura/client/stacking_client.h" | 11 #include "ui/aura/client/stacking_client.h" |
12 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
13 #include "ui/aura/root_window.h" | 13 #include "ui/aura/root_window.h" |
14 #include "ui/aura/shared/root_window_capture_client.h" | 14 #include "ui/aura/shared/root_window_capture_client.h" |
15 #include "ui/aura/single_display_manager.h" | 15 #include "ui/aura/single_display_manager.h" |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_delegate.h" | 17 #include "ui/aura/window_delegate.h" |
18 #include "ui/base/events/event.h" | 18 #include "ui/base/events/event.h" |
19 #include "ui/base/hit_test.h" | 19 #include "ui/base/hit_test.h" |
20 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
21 #include "ui/base/ui_base_paths.h" | 21 #include "ui/base/ui_base_paths.h" |
22 #include "ui/compositor/test/compositor_test_support.h" | 22 #include "ui/compositor/test/compositor_test_support.h" |
23 #include "ui/gfx/canvas.h" | 23 #include "ui/gfx/canvas.h" |
24 #include "ui/gfx/rect.h" | 24 #include "ui/gfx/rect.h" |
25 | 25 |
26 #if defined(USE_X11) | 26 #if defined(USE_X11) |
27 #include "base/message_pump_aurax11.h" | 27 #include "base/message_pump_aurax11.h" |
28 #endif | 28 #endif |
29 | 29 |
| 30 extern int ViewerProcessMain(); |
| 31 |
30 namespace { | 32 namespace { |
31 | 33 |
32 // Trivial WindowDelegate implementation that draws a colored background. | 34 // Trivial WindowDelegate implementation that draws a colored background. |
33 class DemoWindowDelegate : public aura::WindowDelegate { | 35 class DemoWindowDelegate : public aura::WindowDelegate { |
34 public: | 36 public: |
35 explicit DemoWindowDelegate(SkColor color) : color_(color) {} | 37 explicit DemoWindowDelegate(SkColor color) : color_(color) {} |
36 | 38 |
37 // Overridden from WindowDelegate: | 39 // Overridden from WindowDelegate: |
38 virtual gfx::Size GetMinimumSize() const OVERRIDE { | 40 virtual gfx::Size GetMinimumSize() const OVERRIDE { |
39 return gfx::Size(); | 41 return gfx::Size(); |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 } | 113 } |
112 | 114 |
113 private: | 115 private: |
114 aura::RootWindow* root_window_; | 116 aura::RootWindow* root_window_; |
115 | 117 |
116 scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_; | 118 scoped_ptr<aura::shared::RootWindowCaptureClient> capture_client_; |
117 | 119 |
118 DISALLOW_COPY_AND_ASSIGN(DemoStackingClient); | 120 DISALLOW_COPY_AND_ASSIGN(DemoStackingClient); |
119 }; | 121 }; |
120 | 122 |
121 } // namespace | 123 int DemoMain() { |
122 | |
123 int main(int argc, char** argv) { | |
124 CommandLine::Init(argc, argv); | |
125 | |
126 // The exit manager is in charge of calling the dtors of singleton objects. | |
127 base::AtExitManager exit_manager; | |
128 | |
129 ui::RegisterPathProvider(); | |
130 icu_util::Initialize(); | |
131 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | |
132 | |
133 // Create the message-loop here before creating the root window. | 124 // Create the message-loop here before creating the root window. |
134 MessageLoop message_loop(MessageLoop::TYPE_UI); | 125 MessageLoop message_loop(MessageLoop::TYPE_UI); |
135 ui::CompositorTestSupport::Initialize(); | 126 ui::CompositorTestSupport::Initialize(); |
136 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); | 127 aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager); |
137 scoped_ptr<aura::RootWindow> root_window( | 128 scoped_ptr<aura::RootWindow> root_window( |
138 aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); | 129 aura::DisplayManager::CreateRootWindowForPrimaryDisplay()); |
139 scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient( | 130 scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient( |
140 root_window.get())); | 131 root_window.get())); |
141 | 132 |
142 // Create a hierarchy of test windows. | 133 // Create a hierarchy of test windows. |
(...skipping 21 matching lines...) Expand all Loading... |
164 window3.Show(); | 155 window3.Show(); |
165 window3.SetParent(&window2); | 156 window3.SetParent(&window2); |
166 | 157 |
167 root_window->ShowRootWindow(); | 158 root_window->ShowRootWindow(); |
168 MessageLoopForUI::current()->Run(); | 159 MessageLoopForUI::current()->Run(); |
169 | 160 |
170 ui::CompositorTestSupport::Terminate(); | 161 ui::CompositorTestSupport::Terminate(); |
171 | 162 |
172 return 0; | 163 return 0; |
173 } | 164 } |
| 165 |
| 166 int RunMain() { |
| 167 // TODO(scottmg): Something not crappy. |
| 168 if (CommandLine::ForCurrentProcess()->HasSwitch("viewer")) { |
| 169 return ViewerProcessMain(); |
| 170 } else { |
| 171 return DemoMain(); |
| 172 } |
| 173 } |
| 174 |
| 175 } // namespace |
| 176 |
| 177 int main(int argc, char** argv) { |
| 178 CommandLine::Init(argc, argv); |
| 179 |
| 180 // The exit manager is in charge of calling the dtors of singleton objects. |
| 181 base::AtExitManager exit_manager; |
| 182 |
| 183 ui::RegisterPathProvider(); |
| 184 icu_util::Initialize(); |
| 185 ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); |
| 186 |
| 187 return RunMain(); |
| 188 } |
OLD | NEW |