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

Unified Diff: content/browser/android/java_interfaces_impl.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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
Index: content/browser/android/java_interfaces_impl.cc
diff --git a/content/browser/android/java_interfaces_impl.cc b/content/browser/android/java_interfaces_impl.cc
index 9b18c8599b868ff494c6fe19084dc9e584d1dcbf..2cc2b5701b843beed92bd0e9024b0fe0d2c2cb87 100644
--- a/content/browser/android/java_interfaces_impl.cc
+++ b/content/browser/android/java_interfaces_impl.cc
@@ -24,7 +24,7 @@ namespace {
class JavaInterfaceProviderHolder {
public:
JavaInterfaceProviderHolder() {
- shell::mojom::InterfaceProviderPtr provider;
+ service_manager::mojom::InterfaceProviderPtr provider;
JNIEnv* env = base::android::AttachCurrentThread();
Java_InterfaceRegistrarImpl_createInterfaceRegistryForContext(
env, mojo::GetProxy(&provider).PassMessagePipe().release().value(),
@@ -37,20 +37,22 @@ class JavaInterfaceProviderHolder {
return base::Singleton<JavaInterfaceProviderHolder>::get();
}
- shell::InterfaceProvider* GetJavaInterfaces() { return &interface_provider_; }
+ service_manager::InterfaceProvider* GetJavaInterfaces() {
+ return &interface_provider_;
+ }
private:
- shell::InterfaceProvider interface_provider_;
+ service_manager::InterfaceProvider interface_provider_;
};
} // namespace
-shell::InterfaceProvider* GetGlobalJavaInterfaces() {
+service_manager::InterfaceProvider* GetGlobalJavaInterfaces() {
return JavaInterfaceProviderHolder::GetInstance()->GetJavaInterfaces();
}
void BindInterfaceRegistryForWebContents(
- shell::mojom::InterfaceProviderRequest request,
+ service_manager::mojom::InterfaceProviderRequest request,
WebContents* web_contents) {
JNIEnv* env = base::android::AttachCurrentThread();
Java_InterfaceRegistrarImpl_createInterfaceRegistryForWebContents(

Powered by Google App Engine
This is Rietveld 408576698