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

Unified Diff: content/shell/android/shell_manager.cc

Issue 10800019: Refactor ContentShell to remove ContentViewClient dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
« no previous file with comments | « content/shell/android/shell_manager.h ('k') | content/shell/android/shell_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/shell_manager.cc
diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc
index 77a7aec19e7e86f063657967ef26f7d30f837f66..18c1223af4276334031afec21c2e674c3e4ddf0f 100644
--- a/content/shell/android/shell_manager.cc
+++ b/content/shell/android/shell_manager.cc
@@ -7,7 +7,6 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
#include "base/lazy_instance.h"
-#include "content/shell/android/shell_view.h"
#include "jni/shell_manager_jni.h"
using base::android::ScopedJavaLocalRef;
@@ -17,10 +16,10 @@ base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >
namespace content {
-ShellView* CreateShellView() {
+jobject CreateShellView() {
JNIEnv* env = base::android::AttachCurrentThread();
- return reinterpret_cast<ShellView*>(Java_ShellManager_createShell(
- env, g_content_shell_manager.Get().obj()));
+ return Java_ShellManager_createShell(
+ env, g_content_shell_manager.Get().obj()).Release();
}
// Register native methods
« no previous file with comments | « content/shell/android/shell_manager.h ('k') | content/shell/android/shell_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698