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" | 13 #include "chrome/browser/ui/android/tab_model/tab_model_list.h" |
14 #include "components/sessions/core/live_tab.h" | 14 #include "components/sessions/core/live_tab.h" |
15 #include "components/sessions/core/tab_restore_service.h" | 15 #include "components/sessions/core/tab_restore_service.h" |
16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
17 #include "jni/RecentlyClosedBridge_jni.h" | 17 #include "jni/RecentlyClosedBridge_jni.h" |
18 | 18 |
19 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
20 using base::android::ConvertUTF16ToJavaString; | 20 using base::android::ConvertUTF16ToJavaString; |
21 using base::android::ConvertUTF8ToJavaString; | 21 using base::android::ConvertUTF8ToJavaString; |
| 22 using base::android::JavaParamRef; |
22 using base::android::ScopedJavaLocalRef; | 23 using base::android::ScopedJavaLocalRef; |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 void AddTabToList(JNIEnv* env, | 27 void AddTabToList(JNIEnv* env, |
27 sessions::TabRestoreService::Entry* entry, | 28 sessions::TabRestoreService::Entry* entry, |
28 jobject jtabs_list) { | 29 jobject jtabs_list) { |
29 const sessions::TabRestoreService::Tab* tab = | 30 const sessions::TabRestoreService::Tab* tab = |
30 static_cast<sessions::TabRestoreService::Tab*>(entry); | 31 static_cast<sessions::TabRestoreService::Tab*>(entry); |
31 const sessions::SerializedNavigationEntry& current_navigation = | 32 const sessions::SerializedNavigationEntry& current_navigation = |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 const JavaParamRef<jobject>& jprofile) { | 188 const JavaParamRef<jobject>& jprofile) { |
188 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( | 189 RecentlyClosedTabsBridge* bridge = new RecentlyClosedTabsBridge( |
189 ProfileAndroid::FromProfileAndroid(jprofile)); | 190 ProfileAndroid::FromProfileAndroid(jprofile)); |
190 return reinterpret_cast<intptr_t>(bridge); | 191 return reinterpret_cast<intptr_t>(bridge); |
191 } | 192 } |
192 | 193 |
193 // static | 194 // static |
194 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) { | 195 bool RecentlyClosedTabsBridge::Register(JNIEnv* env) { |
195 return RegisterNativesImpl(env); | 196 return RegisterNativesImpl(env); |
196 } | 197 } |
OLD | NEW |