| Index: content/shell/browser/shell_android.cc
|
| diff --git a/content/shell/browser/shell_android.cc b/content/shell/browser/shell_android.cc
|
| index c38e902a4b020640384156032ca9c60c93da25a0..fe8bfc78ba42f902c14942c0034497cbd30baa31 100644
|
| --- a/content/shell/browser/shell_android.cc
|
| +++ b/content/shell/browser/shell_android.cc
|
| @@ -13,7 +13,9 @@
|
| #include "base/strings/string_piece.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/common/content_switches.h"
|
| +#include "content/public/common/service_manager_connection.h"
|
| #include "content/shell/android/shell_manager.h"
|
| +#include "content/shell/common/shell_switches.h"
|
| #include "jni/Shell_jni.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| @@ -104,6 +106,24 @@ bool Shell::Register(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|
| +void Shell::StartMusDemo(JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& caller) {
|
| + DCHECK(!mus_demo_);
|
| +
|
| + mus_demo_.reset(new ui::demo::MusDemo());
|
| +
|
| + service_manager::Connector* connector =
|
| + content::ServiceManagerConnection::GetForProcess()->GetConnector();
|
| + mus_demo_->Start(connector);
|
| +}
|
| +
|
| +// static
|
| +jboolean ShowMusDemoButton(JNIEnv* env,
|
| + const base::android::JavaParamRef<jclass>& jcaller) {
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kShowMusDemoButton);
|
| +}
|
| +
|
| // static
|
| void CloseShell(JNIEnv* env,
|
| const JavaParamRef<jclass>& clazz,
|
|
|