| Index: content/shell/browser/shell.h
|
| diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
|
| index 6f36810032181c1cb1adf595961a10c8e5826579..c2d6f2397f531c2499cf33415e53538d6faa90ac 100644
|
| --- a/content/shell/browser/shell.h
|
| +++ b/content/shell/browser/shell.h
|
| @@ -21,6 +21,7 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/scoped_java_ref.h"
|
| +#include "services/service_manager/public/cpp/connection.h"
|
| #elif defined(USE_AURA)
|
| #if defined(OS_CHROMEOS)
|
|
|
| @@ -118,6 +119,8 @@ class Shell : public WebContentsDelegate,
|
| #elif defined(OS_ANDROID)
|
| // Registers the Android Java to native methods.
|
| static bool Register(JNIEnv* env);
|
| + void StartMusDemo(JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& caller);
|
| #endif
|
|
|
| // WebContentsDelegate
|
| @@ -252,6 +255,7 @@ class Shell : public WebContentsDelegate,
|
|
|
| #if defined(OS_ANDROID)
|
| base::android::ScopedJavaGlobalRef<jobject> java_object_;
|
| + std::unique_ptr<service_manager::Connection> mus_demo_connection_;
|
| #elif defined(USE_AURA)
|
| #if defined(OS_CHROMEOS)
|
| static wm::WMTestHelper* wm_test_helper_;
|
|
|