Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" | |
| 14 #include "components/sessions/core/live_tab.h" | |
| 13 #include "components/sessions/core/tab_restore_service.h" | 15 #include "components/sessions/core/tab_restore_service.h" |
| 14 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 15 #include "jni/RecentlyClosedBridge_jni.h" | 17 #include "jni/RecentlyClosedBridge_jni.h" |
| 16 | 18 |
| 17 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
| 18 using base::android::ConvertUTF16ToJavaString; | 20 using base::android::ConvertUTF16ToJavaString; |
| 19 using base::android::ConvertUTF8ToJavaString; | 21 using base::android::ConvertUTF8ToJavaString; |
| 20 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
| 21 | 23 |
| 22 namespace { | 24 namespace { |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 session_tab.navigations = tab_entry->navigations; | 121 session_tab.navigations = tab_entry->navigations; |
| 120 | 122 |
| 121 WindowOpenDisposition disposition = | 123 WindowOpenDisposition disposition = |
| 122 static_cast<WindowOpenDisposition>(j_disposition); | 124 static_cast<WindowOpenDisposition>(j_disposition); |
| 123 SessionRestore::RestoreForeignSessionTab(web_contents, | 125 SessionRestore::RestoreForeignSessionTab(web_contents, |
| 124 session_tab, | 126 session_tab, |
| 125 disposition); | 127 disposition); |
| 126 return true; | 128 return true; |
| 127 } | 129 } |
| 128 | 130 |
| 131 jboolean RecentlyClosedTabsBridge::OpenMostRecentlyClosedTab( | |
| 132 JNIEnv* env, | |
| 133 const base::android::JavaParamRef<jobject>& obj) { | |
| 134 EnsureTabRestoreService(); | |
| 135 if (!tab_restore_service_ || TabModelList::empty() || | |
| 136 tab_restore_service_->entries().empty()) | |
| 137 return false; | |
| 138 | |
| 139 // Passing nullptr here because LiveTabContext will be determined later by | |
| 140 // a call to AndroidLiveTabContext. | |
|
Theresa
2016/07/12 17:25:17
s/AndroidLiveTabContext/AndroidLiveTabContext::Fin
| |
| 141 std::vector<sessions::LiveTab*> restored_tab = | |
| 142 tab_restore_service_->RestoreMostRecentEntry(nullptr); | |
| 143 | |
| 144 return restored_tab.empty() ? false : true; | |
| 145 } | |
| 146 | |
| 129 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs( | 147 void RecentlyClosedTabsBridge::ClearRecentlyClosedTabs( |
| 130 JNIEnv* env, | 148 JNIEnv* env, |
| 131 const JavaParamRef<jobject>& obj) { | 149 const JavaParamRef<jobject>& obj) { |
| 132 EnsureTabRestoreService(); | 150 EnsureTabRestoreService(); |
| 133 if (tab_restore_service_) | 151 if (tab_restore_service_) |
| 134 tab_restore_service_->ClearEntries(); | 152 tab_restore_service_->ClearEntries(); |
| 135 } | 153 } |
| 136 | 154 |
| 137 void RecentlyClosedTabsBridge::TabRestoreServiceChanged( | 155 void RecentlyClosedTabsBridge::TabRestoreServiceChanged( |
| 138 sessions::TabRestoreService* service) { | 156 sessions::TabRestoreService* service) { |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 168 const JavaParamRef<jobject>& jprofile) { | 186 const JavaParamRef<jobject>& jprofile) { |
| 169 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( | 187 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( |
| 170 ProfileAndroid::FromProfileAndroid(jprofile)); | 188 ProfileAndroid::FromProfileAndroid(jprofile)); |
| 171 return reinterpret_cast<intptr_t>(bridge); | 189 return reinterpret_cast<intptr_t>(bridge); |
| 172 } | 190 } |
| 173 | 191 |
| 174 // static | 192 // static |
| 175 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) { | 193 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) { |
| 176 return RegisterNativesImpl(env); | 194 return RegisterNativesImpl(env); |
| 177 } | 195 } |
| OLD | NEW |