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

Side by Side Diff: mojo/services/native_viewport/native_viewport_service.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
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 "mojo/services/native_viewport/native_viewport_service.h" 5 #include "mojo/services/native_viewport/native_viewport_service.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "mojo/public/bindings/allocation_scope.h" 10 #include "mojo/public/bindings/allocation_scope.h"
11 #include "mojo/public/shell/shell.mojom.h" 11 #include "mojo/public/interfaces/shell/shell.mojom.h"
12 #include "mojo/services/gles2/command_buffer_impl.h" 12 #include "mojo/services/gles2/command_buffer_impl.h"
13 #include "mojo/services/native_viewport/geometry_conversions.h" 13 #include "mojo/services/native_viewport/geometry_conversions.h"
14 #include "mojo/services/native_viewport/native_viewport.h" 14 #include "mojo/services/native_viewport/native_viewport.h"
15 #include "mojo/services/native_viewport/native_viewport.mojom.h" 15 #include "mojo/services/native_viewport/native_viewport.mojom.h"
16 #include "ui/events/event.h" 16 #include "ui/events/event.h"
17 17
18 namespace mojo { 18 namespace mojo {
19 namespace services { 19 namespace services {
20 namespace { 20 namespace {
21 21
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 base::MessageLoopForUI loop; 204 base::MessageLoopForUI loop;
205 mojo::Application app(shell_handle); 205 mojo::Application app(shell_handle);
206 app.AddServiceFactory( 206 app.AddServiceFactory(
207 new mojo::ServiceFactory<mojo::services::NativeViewportImpl, 207 new mojo::ServiceFactory<mojo::services::NativeViewportImpl,
208 mojo::shell::Context>); 208 mojo::shell::Context>);
209 loop.Run(); 209 loop.Run();
210 return MOJO_RESULT_OK; 210 return MOJO_RESULT_OK;
211 } 211 }
212 212
213 #endif // !OS_ANDROID 213 #endif // !OS_ANDROID
OLDNEW
« no previous file with comments | « mojo/services/native_viewport/native_viewport_service.h ('k') | mojo/shell/android/mojo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698