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

Unified Diff: chrome/browser/android/recently_closed_tabs_bridge.cc

Issue 2610143002: Add RecentTabsPageTest (Closed)
Patch Set: Undo the prefs changes. Created 3 years, 11 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
Index: chrome/browser/android/recently_closed_tabs_bridge.cc
diff --git a/chrome/browser/android/recently_closed_tabs_bridge.cc b/chrome/browser/android/recently_closed_tabs_bridge.cc
index 5812266c8556a48347aae7067c0ce17b0402a1af..f4e19c5fb03b870da19a09b237070232cd42430a 100644
--- a/chrome/browser/android/recently_closed_tabs_bridge.cc
+++ b/chrome/browser/android/recently_closed_tabs_bridge.cc
@@ -53,10 +53,12 @@ void AddTabsToList(JNIEnv* env,
} // namespace
-RecentlyClosedTabsBridge::RecentlyClosedTabsBridge(Profile* profile)
- : profile_(profile),
- tab_restore_service_(NULL) {
-}
+RecentlyClosedTabsBridge::RecentlyClosedTabsBridge(
+ const JavaParamRef<jobject>& bridge,
+ Profile* profile)
+ : bridge_(AttachCurrentThread(), bridge),
Bernhard Bauer 2017/01/04 11:54:16 Nit: I think what I would do is create the ScopedJ
Michael van Ouwerkerk 2017/01/05 11:02:14 Done.
+ profile_(profile),
+ tab_restore_service_(NULL) {}
RecentlyClosedTabsBridge::~RecentlyClosedTabsBridge() {
if (tab_restore_service_)
@@ -68,13 +70,6 @@ void RecentlyClosedTabsBridge::Destroy(JNIEnv* env,
delete this;
}
-void RecentlyClosedTabsBridge::SetRecentlyClosedCallback(
- JNIEnv* env,
- const JavaParamRef<jobject>& obj,
- const JavaParamRef<jobject>& jcallback) {
- callback_.Reset(env, jcallback);
-}
-
jboolean RecentlyClosedTabsBridge::GetRecentlyClosedTabs(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
@@ -152,10 +147,7 @@ void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs(
void RecentlyClosedTabsBridge::TabRestoreServiceChanged(
sessions::TabRestoreService* service) {
- if (callback_.is_null())
- return;
- JNIEnv* env = AttachCurrentThread();
- Java_RecentlyClosedCallback_onUpdated(env, callback_);
+ Java_RecentlyClosedBridge_onUpdated(AttachCurrentThread(), bridge_);
}
void RecentlyClosedTabsBridge::TabRestoreServiceDestroyed(
@@ -183,7 +175,7 @@ static jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& jprofile) {
RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge(
- ProfileAndroid::FromProfileAndroid(jprofile));
+ obj, ProfileAndroid::FromProfileAndroid(jprofile));
return reinterpret_cast<intptr_t>(bridge);
}

Powered by Google App Engine
This is Rietveld 408576698