Index: content/browser/service_manager/service_manager_context.h |
diff --git a/content/browser/mojo/mojo_shell_context.h b/content/browser/service_manager/service_manager_context.h |
similarity index 53% |
rename from content/browser/mojo/mojo_shell_context.h |
rename to content/browser/service_manager/service_manager_context.h |
index 8885270116803a651ee29c97b1adc3e711ad8d18..273ead7f69b0e40598ab4afdbc9f588e8aeee6a0 100644 |
--- a/content/browser/mojo/mojo_shell_context.h |
+++ b/content/browser/service_manager/service_manager_context.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
-#define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
+#ifndef CONTENT_BROWSER_SERVICE_MANAGER_SERVICE_MANAGER_CONTEXT_H_ |
+#define CONTENT_BROWSER_SERVICE_MANAGER_SERVICE_MANAGER_CONTEXT_H_ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
@@ -15,13 +15,13 @@ class Connector; |
namespace content { |
-// MojoShellContext manages the browser's connection to the ServiceManager, |
-// hosting a new in-process ServiceManager if the browser was not launched from |
-// an external one. |
-class CONTENT_EXPORT MojoShellContext { |
+// ServiceManagerContext manages the browser's connection to the ServiceManager, |
+// hosting a new in-process ServiceManagerContext if the browser was not |
+// launched from an external one. |
+class CONTENT_EXPORT ServiceManagerContext { |
public: |
- MojoShellContext(); |
- ~MojoShellContext(); |
+ ServiceManagerContext(); |
+ ~ServiceManagerContext(); |
// Returns a shell::Connector that can be used on the IO thread. |
static shell::Connector* GetConnectorForIOThread(); |
@@ -31,9 +31,9 @@ class CONTENT_EXPORT MojoShellContext { |
scoped_refptr<InProcessServiceManagerContext> in_process_context_; |
- DISALLOW_COPY_AND_ASSIGN(MojoShellContext); |
+ DISALLOW_COPY_AND_ASSIGN(ServiceManagerContext); |
}; |
} // namespace content |
-#endif // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_ |
+#endif // CONTENT_BROWSER_SERVICE_MANAGER_SERVICE_MANAGER_CONTEXT_H_ |