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

Unified Diff: content/common/mojo/static_loader.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/mojo/static_loader.h ('k') | content/common/process_control.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mojo/static_loader.cc
diff --git a/content/common/mojo/static_loader.cc b/content/common/mojo/static_loader.cc
index 16c4b42fe6bec12bc675b64560995f75f32ccc94..ad48020be823991919090d8f7f4156b0fb3858f2 100644
--- a/content/common/mojo/static_loader.cc
+++ b/content/common/mojo/static_loader.cc
@@ -24,7 +24,7 @@ namespace {
class RunnerThread : public base::SimpleThread {
public:
RunnerThread(const std::string& name,
- mojo::shell::mojom::ShellClientRequest request,
+ shell::mojom::ShellClientRequest request,
scoped_refptr<base::TaskRunner> exit_task_runner,
const base::Closure& exit_callback,
const StaticLoader::ApplicationFactory& factory)
@@ -35,15 +35,15 @@ class RunnerThread : public base::SimpleThread {
factory_(factory) {}
void Run() override {
- std::unique_ptr<mojo::ApplicationRunner> runner(
- new mojo::ApplicationRunner(factory_.Run().release()));
+ std::unique_ptr<shell::ApplicationRunner> runner(
+ new shell::ApplicationRunner(factory_.Run().release()));
runner->Run(request_.PassMessagePipe().release().value(),
false /* init_base */);
exit_task_runner_->PostTask(FROM_HERE, exit_callback_);
}
private:
- mojo::shell::mojom::ShellClientRequest request_;
+ shell::mojom::ShellClientRequest request_;
scoped_refptr<base::TaskRunner> exit_task_runner_;
base::Closure exit_callback_;
StaticLoader::ApplicationFactory factory_;
@@ -68,7 +68,7 @@ StaticLoader::~StaticLoader() {
}
void StaticLoader::Load(const std::string& name,
- mojo::shell::mojom::ShellClientRequest request) {
+ shell::mojom::ShellClientRequest request) {
if (thread_)
return;
« no previous file with comments | « content/common/mojo/static_loader.h ('k') | content/common/process_control.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698