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

Side by Side Diff: chrome/browser/android/recently_closed_tabs_bridge.cc

Issue 2088443003: Shortcut ctrl+shift+T added on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unused includes in recently_closed_tab_bridge.cc Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 5 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "chrome/browser/android/tab_android.h" 8 #include "chrome/browser/android/tab_android.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_android.h" 10 #include "chrome/browser/profiles/profile_android.h"
11 #include "chrome/browser/sessions/session_restore.h" 11 #include "chrome/browser/sessions/session_restore.h"
12 #include "chrome/browser/sessions/tab_restore_service_factory.h" 12 #include "chrome/browser/sessions/tab_restore_service_factory.h"
13 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
13 #include "components/sessions/core/tab_restore_service.h" 14 #include "components/sessions/core/tab_restore_service.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "jni/RecentlyClosedBridge_jni.h" 16 #include "jni/RecentlyClosedBridge_jni.h"
16 17
17 using base::android::AttachCurrentThread; 18 using base::android::AttachCurrentThread;
18 using base::android::ConvertUTF16ToJavaString; 19 using base::android::ConvertUTF16ToJavaString;
19 using base::android::ConvertUTF8ToJavaString; 20 using base::android::ConvertUTF8ToJavaString;
20 using base::android::ScopedJavaLocalRef; 21 using base::android::ScopedJavaLocalRef;
21 22
22 namespace { 23 namespace {
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 session_tab.navigations = tab_entry->navigations; 120 session_tab.navigations = tab_entry->navigations;
120 121
121 WindowOpenDisposition disposition = 122 WindowOpenDisposition disposition =
122 static_cast<WindowOpenDisposition>(j_disposition); 123 static_cast<WindowOpenDisposition>(j_disposition);
123 SessionRestore::RestoreForeignSessionTab(web_contents, 124 SessionRestore::RestoreForeignSessionTab(web_contents,
124 session_tab, 125 session_tab,
125 disposition); 126 disposition);
126 return true; 127 return true;
127 } 128 }
128 129
130 jboolean RecentlyClosedTabsBridge::OpenMostRecentlyClosedTab(
131 JNIEnv* env,
132 const base::android::JavaParamRef<jobject>& obj) {
133 EnsureTabRestoreService();
134 if (!tab_restore_service_ || TabModelList::empty() ||
135 tab_restore_service_->entries().empty())
136 return false;
137
138 tab_restore_service_->RestoreMostRecentEntry(nullptr);
Theresa 2016/07/07 19:00:13 Please add a comment here explaining that we're pa
xingliu 2016/07/08 21:26:48 Done.
139 return true;
Theresa 2016/07/07 19:00:13 Should we check that TabRestoreService::RestoreMos
xingliu 2016/07/08 21:26:48 Done.
140 }
141
129 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs( 142 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs(
130 JNIEnv* env, 143 JNIEnv* env,
131 const JavaParamRef<jobject>& obj) { 144 const JavaParamRef<jobject>& obj) {
132 EnsureTabRestoreService(); 145 EnsureTabRestoreService();
133 if (tab_restore_service_) 146 if (tab_restore_service_)
134 tab_restore_service_->ClearEntries(); 147 tab_restore_service_->ClearEntries();
135 } 148 }
136 149
137 void RecentlyClosedTabsBridge::TabRestoreServiceChanged( 150 void RecentlyClosedTabsBridge::TabRestoreServiceChanged(
138 sessions::TabRestoreService* service) { 151 sessions::TabRestoreService* service) {
(...skipping 29 matching lines...) Expand all
168 const JavaParamRef<jobject>& jprofile) { 181 const JavaParamRef<jobject>& jprofile) {
169 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( 182 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge(
170 ProfileAndroid::FromProfileAndroid(jprofile)); 183 ProfileAndroid::FromProfileAndroid(jprofile));
171 return reinterpret_cast<intptr_t>(bridge); 184 return reinterpret_cast<intptr_t>(bridge);
172 } 185 }
173 186
174 // static 187 // static
175 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) { 188 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) {
176 return RegisterNativesImpl(env); 189 return RegisterNativesImpl(env);
177 } 190 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698