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

Side by Side Diff: mojo/shell/context.cc

Issue 164313002: Rename ServiceConnector back to ServiceManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bad upload Created 6 years, 10 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.h ('k') | mojo/shell/dynamic_service_loader.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 "mojo/shell/context.h" 5 #include "mojo/shell/context.h"
6 6
7 #include "mojo/gles2/gles2_support_impl.h" 7 #include "mojo/gles2/gles2_support_impl.h"
8 #include "mojo/shell/dynamic_service_loader.h" 8 #include "mojo/shell/dynamic_service_loader.h"
9 #include "mojo/shell/network_delegate.h" 9 #include "mojo/shell/network_delegate.h"
10 #include "mojo/system/embedder/embedder.h" 10 #include "mojo/system/embedder/embedder.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 namespace shell { 13 namespace shell {
14 14
15 Context::Context() 15 Context::Context()
16 : task_runners_(base::MessageLoop::current()->message_loop_proxy()), 16 : task_runners_(base::MessageLoop::current()->message_loop_proxy()),
17 storage_(), 17 storage_(),
18 loader_(task_runners_.io_runner(), 18 loader_(task_runners_.io_runner(),
19 task_runners_.file_runner(), 19 task_runners_.file_runner(),
20 task_runners_.cache_runner(), 20 task_runners_.cache_runner(),
21 scoped_ptr<net::NetworkDelegate>(new NetworkDelegate()), 21 scoped_ptr<net::NetworkDelegate>(new NetworkDelegate()),
22 storage_.profile_path()) { 22 storage_.profile_path()) {
23 embedder::Init(); 23 embedder::Init();
24 gles2::GLES2SupportImpl::Init(); 24 gles2::GLES2SupportImpl::Init();
25 dynamic_service_loader_.reset(new DynamicServiceLoader(this)); 25 dynamic_service_loader_.reset(new DynamicServiceLoader(this));
26 service_connector_.set_default_loader(dynamic_service_loader_.get()); 26 service_manager_.set_default_loader(dynamic_service_loader_.get());
27 } 27 }
28 28
29 Context::~Context() { 29 Context::~Context() {
30 service_connector_.set_default_loader(NULL); 30 service_manager_.set_default_loader(NULL);
31 } 31 }
32 32
33 } // namespace shell 33 } // namespace shell
34 } // namespace mojo 34 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698