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

Side by Side Diff: services/shell/background/background_shell.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/background/background_shell.h" 5 #include "services/shell/background/background_shell.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "base/threading/simple_thread.h" 13 #include "base/threading/simple_thread.h"
14 #include "mojo/message_pump/message_pump_mojo.h" 14 #include "mojo/message_pump/message_pump_mojo.h"
15 #include "mojo/services/catalog/store.h" 15 #include "mojo/services/catalog/store.h"
16 #include "mojo/shell/connect_params.h" 16 #include "services/shell/connect_params.h"
17 #include "mojo/shell/loader.h" 17 #include "services/shell/loader.h"
18 #include "mojo/shell/public/cpp/shell_client.h" 18 #include "services/shell/public/cpp/shell_client.h"
19 #include "mojo/shell/public/cpp/shell_connection.h" 19 #include "services/shell/public/cpp/shell_connection.h"
20 #include "mojo/shell/shell.h" 20 #include "services/shell/shell.h"
21 #include "mojo/shell/standalone/context.h" 21 #include "services/shell/standalone/context.h"
22 22
23 namespace mojo { 23 namespace mojo {
24 namespace shell { 24 namespace shell {
25 namespace { 25 namespace {
26 26
27 scoped_ptr<base::MessagePump> CreateMessagePumpMojo() { 27 scoped_ptr<base::MessagePump> CreateMessagePumpMojo() {
28 return make_scoped_ptr(new common::MessagePumpMojo); 28 return make_scoped_ptr(new common::MessagePumpMojo);
29 } 29 }
30 30
31 // Used to obtain the ShellClientRequest for an application. When Loader::Load() 31 // Used to obtain the ShellClientRequest for an application. When Loader::Load()
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 200
201 void BackgroundShell::ExecuteOnShellThread( 201 void BackgroundShell::ExecuteOnShellThread(
202 const ShellThreadCallback& callback) { 202 const ShellThreadCallback& callback) {
203 thread_->message_loop()->task_runner()->PostTask( 203 thread_->message_loop()->task_runner()->PostTask(
204 FROM_HERE, base::Bind(&MojoThread::RunShellCallback, 204 FROM_HERE, base::Bind(&MojoThread::RunShellCallback,
205 base::Unretained(thread_.get()), callback)); 205 base::Unretained(thread_.get()), callback));
206 } 206 }
207 207
208 } // namespace shell 208 } // namespace shell
209 } // namespace mojo 209 } // namespace mojo
OLDNEW
« no previous file with comments | « services/shell/background/background_shell.h ('k') | services/shell/background/background_shell_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698