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

Unified Diff: content/shell/browser/shell.h

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Fix mac bot Created 4 years, 1 month 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
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/shell_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « content/shell/browser/DEPS ('k') | content/shell/browser/shell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698