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

Side by Side Diff: mojo/shell/desktop/mojo_main.cc

Issue 203373004: Mojo: Move mojo/system/embedder to mojo/embedder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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/shell/context.cc ('k') | mojo/system/channel.h » ('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 "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/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" // TODO(vtl): Remove. 8 #include "base/macros.h" // TODO(vtl): Remove.
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "mojo/common/message_pump_mojo.h" 10 #include "mojo/common/message_pump_mojo.h"
11 #include "mojo/embedder/embedder.h"
11 #include "mojo/shell/child_process.h" 12 #include "mojo/shell/child_process.h"
12 #include "mojo/shell/child_process_host.h" // TODO(vtl): Remove. 13 #include "mojo/shell/child_process_host.h" // TODO(vtl): Remove.
13 #include "mojo/shell/context.h" 14 #include "mojo/shell/context.h"
14 #include "mojo/shell/init.h" 15 #include "mojo/shell/init.h"
15 #include "mojo/shell/run.h" 16 #include "mojo/shell/run.h"
16 #include "mojo/system/embedder/embedder.h"
17 #include "ui/gl/gl_surface.h" 17 #include "ui/gl/gl_surface.h"
18 18
19 namespace { 19 namespace {
20 20
21 // TODO(vtl): Remove. 21 // TODO(vtl): Remove.
22 class TestChildProcessHostDelegate 22 class TestChildProcessHostDelegate
23 : public mojo::shell::ChildProcessHost::Delegate { 23 : public mojo::shell::ChildProcessHost::Delegate {
24 public: 24 public:
25 TestChildProcessHostDelegate() {} 25 TestChildProcessHostDelegate() {}
26 virtual ~TestChildProcessHostDelegate() {} 26 virtual ~TestChildProcessHostDelegate() {}
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 base::MessageLoop message_loop; 75 base::MessageLoop message_loop;
76 mojo::shell::Context context; 76 mojo::shell::Context context;
77 message_loop.PostTask(FROM_HERE, base::Bind(mojo::shell::Run, &context)); 77 message_loop.PostTask(FROM_HERE, base::Bind(mojo::shell::Run, &context));
78 78
79 message_loop.Run(); 79 message_loop.Run();
80 } 80 }
81 81
82 return 0; 82 return 0;
83 } 83 }
OLDNEW
« no previous file with comments | « mojo/shell/context.cc ('k') | mojo/system/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698