| Index: content/shell/browser/shell.h
|
| diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
|
| index da0089d5f21dcd8dbe1bc8bf3bbc431390b95764..fef0b67034967075ef4b87ac05131caf52fda2f0 100644
|
| --- a/content/shell/browser/shell.h
|
| +++ b/content/shell/browser/shell.h
|
| @@ -20,6 +20,7 @@
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/scoped_java_ref.h"
|
| +#include "services/ui/demo/mus_demo.h" // nogncheck
|
| #elif defined(USE_AURA)
|
| #if defined(OS_CHROMEOS)
|
|
|
| @@ -113,6 +114,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
|
| @@ -247,6 +250,7 @@ class Shell : public WebContentsDelegate,
|
|
|
| #if defined(OS_ANDROID)
|
| base::android::ScopedJavaGlobalRef<jobject> java_object_;
|
| + std::unique_ptr<ui::demo::MusDemo> mus_demo_;
|
| #elif defined(USE_AURA)
|
| #if defined(OS_CHROMEOS)
|
| static wm::WMTestHelper* wm_test_helper_;
|
|
|