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

Unified Diff: mojo/runner/context.h

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 | « mojo/runner/child_process_host_unittest.cc ('k') | mojo/runner/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/context.h
diff --git a/mojo/runner/context.h b/mojo/runner/context.h
index 6f4c1505ceafe4eabd0987e2452b8164e0669d11..06a27542113a2df7bd1a02b58928349fba85bf2d 100644
--- a/mojo/runner/context.h
+++ b/mojo/runner/context.h
@@ -14,12 +14,12 @@
#include "mojo/shell/application_manager.h"
namespace mojo {
-namespace shell {
+namespace runner {
class NativeApplicationLoader;
// The "global" context for the shell's main process.
-class Context : public ApplicationManager::Delegate,
+class Context : public shell::ApplicationManager::Delegate,
public embedder::ProcessDelegate {
public:
Context();
@@ -56,7 +56,9 @@ class Context : public ApplicationManager::Delegate,
void Run(const GURL& url);
TaskRunners* task_runners() { return task_runners_.get(); }
- ApplicationManager* application_manager() { return &application_manager_; }
+ shell::ApplicationManager* application_manager() {
+ return &application_manager_;
+ }
URLResolver* url_resolver() { return &url_resolver_; }
private:
@@ -73,7 +75,7 @@ class Context : public ApplicationManager::Delegate,
std::set<GURL> app_urls_;
scoped_ptr<TaskRunners> task_runners_;
- ApplicationManager application_manager_;
+ shell::ApplicationManager application_manager_;
URLResolver url_resolver_;
GURL shell_file_root_;
GURL command_line_cwd_;
@@ -81,7 +83,7 @@ class Context : public ApplicationManager::Delegate,
DISALLOW_COPY_AND_ASSIGN(Context);
};
-} // namespace shell
+} // namespace runner
} // namespace mojo
#endif // MOJO_RUNNER_CONTEXT_H_
« no previous file with comments | « mojo/runner/child_process_host_unittest.cc ('k') | mojo/runner/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698