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

Side by Side Diff: mojo/shell/context.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/child_process_host.cc ('k') | mojo/shell/desktop/mojo_main.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 "mojo/shell/context.h" 5 #include "mojo/shell/context.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "mojo/embedder/embedder.h"
8 #include "mojo/gles2/gles2_support_impl.h" 9 #include "mojo/gles2/gles2_support_impl.h"
9 #include "mojo/shell/dynamic_service_loader.h" 10 #include "mojo/shell/dynamic_service_loader.h"
10 #include "mojo/shell/in_process_dynamic_service_runner.h" 11 #include "mojo/shell/in_process_dynamic_service_runner.h"
11 #include "mojo/shell/network_delegate.h" 12 #include "mojo/shell/network_delegate.h"
12 #include "mojo/shell/out_of_process_dynamic_service_runner.h" 13 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
13 #include "mojo/shell/switches.h" 14 #include "mojo/shell/switches.h"
14 #include "mojo/system/embedder/embedder.h"
15 15
16 namespace mojo { 16 namespace mojo {
17 namespace shell { 17 namespace shell {
18 18
19 Context::Context() 19 Context::Context()
20 : task_runners_(base::MessageLoop::current()->message_loop_proxy()), 20 : task_runners_(base::MessageLoop::current()->message_loop_proxy()),
21 storage_(), 21 storage_(),
22 loader_(task_runners_.io_runner(), 22 loader_(task_runners_.io_runner(),
23 task_runners_.file_runner(), 23 task_runners_.file_runner(),
24 task_runners_.cache_runner(), 24 task_runners_.cache_runner(),
(...skipping 12 matching lines...) Expand all
37 new DynamicServiceLoader(this, runner_factory.Pass())); 37 new DynamicServiceLoader(this, runner_factory.Pass()));
38 service_manager_.set_default_loader(dynamic_service_loader_.get()); 38 service_manager_.set_default_loader(dynamic_service_loader_.get());
39 } 39 }
40 40
41 Context::~Context() { 41 Context::~Context() {
42 service_manager_.set_default_loader(NULL); 42 service_manager_.set_default_loader(NULL);
43 } 43 }
44 44
45 } // namespace shell 45 } // namespace shell
46 } // namespace mojo 46 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/child_process_host.cc ('k') | mojo/shell/desktop/mojo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698