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

Unified Diff: chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc

Issue 583373002: Break apart the TabModelBase's JNI calls into its own class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Blarg. Created 6 years, 2 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 | « chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ccca4ebc4187546bc1b6df2851a3fb0ceee44491
--- /dev/null
+++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
@@ -0,0 +1,164 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/android/jni_weak_ref.h"
+#include "chrome/browser/android/tab_android.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_android.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
+#include "content/public/browser/web_contents.h"
+#include "jni/TabModelJniBridge_jni.h"
+
+using base::android::AttachCurrentThread;
+using base::android::ConvertUTF8ToJavaString;
+using content::WebContents;
+
+namespace {
+
+static Profile* FindProfile(jboolean is_incognito) {
+ if (g_browser_process == NULL ||
+ g_browser_process->profile_manager() == NULL) {
+ LOG(ERROR) << "Browser process or profile manager not initialized";
+ return NULL;
+ }
+ Profile* profile = ProfileManager::GetActiveUserProfile();
+ if (is_incognito)
+ return profile->GetOffTheRecordProfile();
+ return profile;
+}
+
+} // namespace
+
+TabModelJniBridge::TabModelJniBridge(JNIEnv* env,
+ jobject jobj,
+ bool is_incognito)
+ : TabModel(FindProfile(is_incognito)),
+ java_object_(env, env->NewWeakGlobalRef(jobj)) {
+ TabModelList::AddTabModel(this);
+ Java_TabModelJniBridge_setNativePtr(env,
+ jobj,
+ reinterpret_cast<intptr_t>(this));
+}
+
+void TabModelJniBridge::Destroy(JNIEnv* env, jobject obj) {
+ delete this;
+}
+
+ScopedJavaLocalRef<jobject> TabModelJniBridge::GetProfileAndroid(JNIEnv* env,
+ jobject obj) {
+ ProfileAndroid* profile_android = ProfileAndroid::FromProfile(GetProfile());
+ if (!profile_android)
+ return ScopedJavaLocalRef<jobject>();
+ return profile_android->GetJavaObject();
+}
+
+void TabModelJniBridge::TabAddedToModel(JNIEnv* env,
+ jobject obj,
+ jobject jtab) {
+ TabAndroid* tab = TabAndroid::GetNativeTab(env, jtab);
+
+ // Tab#initialize() should have been called by now otherwise we can't push
+ // the window id.
+ DCHECK(tab);
+
+ tab->SetWindowSessionID(GetSessionId());
+}
+
+int TabModelJniBridge::GetTabCount() const {
+ JNIEnv* env = AttachCurrentThread();
+ return Java_TabModelJniBridge_getCount(env, java_object_.get(env).obj());
+}
+
+int TabModelJniBridge::GetActiveIndex() const {
+ JNIEnv* env = AttachCurrentThread();
+ return Java_TabModelJniBridge_index(env, java_object_.get(env).obj());
+}
+
+void TabModelJniBridge::CreateTab(WebContents* web_contents,
+ int parent_tab_id) {
+ JNIEnv* env = AttachCurrentThread();
+ Java_TabModelJniBridge_createTabWithNativeContents(
+ env, java_object_.get(env).obj(),
+ web_contents->GetBrowserContext()->IsOffTheRecord(),
+ reinterpret_cast<intptr_t>(web_contents), parent_tab_id);
+}
+
+WebContents* TabModelJniBridge::GetWebContentsAt(int index) const {
+ TabAndroid* tab = GetTabAt(index);
+ return tab == NULL ? NULL : tab->web_contents();
+}
+
+TabAndroid* TabModelJniBridge::GetTabAt(int index) const {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> jtab =
+ Java_TabModelJniBridge_getTabAt(env,
+ java_object_.get(env).obj(),
+ index);
+
+ return jtab.is_null() ?
+ NULL : TabAndroid::GetNativeTab(env, jtab.obj());
+}
+
+void TabModelJniBridge::SetActiveIndex(int index) {
+ JNIEnv* env = AttachCurrentThread();
+ Java_TabModelJniBridge_setIndex(env, java_object_.get(env).obj(), index);
+}
+
+void TabModelJniBridge::CloseTabAt(int index) {
+ JNIEnv* env = AttachCurrentThread();
+ Java_TabModelJniBridge_closeTabAt(env,
+ java_object_.get(env).obj(),
+ index);
+}
+
+WebContents* TabModelJniBridge::CreateNewTabForDevTools(
+ const GURL& url) {
+ // TODO(dfalcantara): Change the Java side so that it creates and returns the
+ // WebContents, which we can load the URL on and return.
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jstring> jurl = ConvertUTF8ToJavaString(env, url.spec());
+ ScopedJavaLocalRef<jobject> obj =
+ Java_TabModelJniBridge_createNewTabForDevTools(
+ env,
+ java_object_.get(env).obj(),
+ jurl.obj());
+ if (obj.is_null()) {
+ VLOG(0) << "Failed to create java tab";
+ return NULL;
+ }
+ TabAndroid* tab = TabAndroid::GetNativeTab(env, obj.obj());
+ if (!tab) {
+ VLOG(0) << "Failed to create java tab";
+ return NULL;
+ }
+ return tab->web_contents();
+}
+
+bool TabModelJniBridge::IsSessionRestoreInProgress() const {
+ JNIEnv* env = AttachCurrentThread();
+ return Java_TabModelJniBridge_isSessionRestoreInProgress(
+ env, java_object_.get(env).obj());
+}
+
+void TabModelJniBridge::BroadcastSessionRestoreComplete(JNIEnv* env,
+ jobject obj) {
+ TabModel::BroadcastSessionRestoreComplete();
+}
+
+TabModelJniBridge::~TabModelJniBridge() {
+ TabModelList::RemoveTabModel(this);
+ JNIEnv* env = AttachCurrentThread();
+ Java_TabModelJniBridge_clearNativePtr(env, java_object_.get(env).obj());
+}
+
+bool TabModelJniBridge::Register(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
« no previous file with comments | « chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698