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

Side by Side Diff: mojo/examples/aura_demo/aura_demo.cc

Issue 219583003: Mojo: Move mojo/public/shell to mojo/public/{cpp,interfaces}/shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « mojo/apps/js/main.js ('k') | mojo/examples/compositor_app/compositor_app.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 #include <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 7
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "mojo/examples/aura_demo/demo_screen.h" 11 #include "mojo/examples/aura_demo/demo_screen.h"
12 #include "mojo/examples/aura_demo/window_tree_host_mojo.h" 12 #include "mojo/examples/aura_demo/window_tree_host_mojo.h"
13 #include "mojo/public/bindings/allocation_scope.h" 13 #include "mojo/public/bindings/allocation_scope.h"
14 #include "mojo/public/cpp/gles2/gles2.h" 14 #include "mojo/public/cpp/gles2/gles2.h"
15 #include "mojo/public/cpp/shell/application.h"
15 #include "mojo/public/cpp/system/core.h" 16 #include "mojo/public/cpp/system/core.h"
16 #include "mojo/public/shell/application.h" 17 #include "mojo/public/interfaces/shell/shell.mojom.h"
17 #include "mojo/public/shell/shell.mojom.h"
18 #include "mojo/services/native_viewport/native_viewport.mojom.h" 18 #include "mojo/services/native_viewport/native_viewport.mojom.h"
19 #include "ui/aura/client/default_capture_client.h" 19 #include "ui/aura/client/default_capture_client.h"
20 #include "ui/aura/client/window_tree_client.h" 20 #include "ui/aura/client/window_tree_client.h"
21 #include "ui/aura/env.h" 21 #include "ui/aura/env.h"
22 #include "ui/aura/window.h" 22 #include "ui/aura/window.h"
23 #include "ui/aura/window_delegate.h" 23 #include "ui/aura/window_delegate.h"
24 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
25 #include "ui/gfx/canvas.h" 25 #include "ui/gfx/canvas.h"
26 26
27 #if defined(WIN32) 27 #if defined(WIN32)
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 // TODO(beng): This crashes in a DCHECK on X11 because this thread's 187 // TODO(beng): This crashes in a DCHECK on X11 because this thread's
188 // MessageLoop is not of TYPE_UI. I think we need a way to build 188 // MessageLoop is not of TYPE_UI. I think we need a way to build
189 // Aura that doesn't define platform-specific stuff. 189 // Aura that doesn't define platform-specific stuff.
190 aura::Env::CreateInstance(); 190 aura::Env::CreateInstance();
191 mojo::examples::AuraDemo app(shell_handle); 191 mojo::examples::AuraDemo app(shell_handle);
192 loop.Run(); 192 loop.Run();
193 193
194 return MOJO_RESULT_OK; 194 return MOJO_RESULT_OK;
195 } 195 }
OLDNEW
« no previous file with comments | « mojo/apps/js/main.js ('k') | mojo/examples/compositor_app/compositor_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698