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

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

Issue 1442433003: Add "Show saved copy" button in dino page when there's offline copy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update button color for "Show all saved pages" per UI review Created 5 years, 1 month 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/android/tab_android.h ('k') | chrome/browser/net/net_error_tab_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 2d0e15b561ec78ae2a5e4b15d6782c5c23994661..44f54bfca90a7010ecdee0f1495b2b128f200041 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -287,20 +287,6 @@ void TabAndroid::MakeLoadURLParams(
}
}
-bool TabAndroid::HasOfflinePages() const {
- if (!offline_pages::IsOfflinePagesEnabled())
- return false;
- offline_pages::OfflinePageModel* offline_page_model =
- offline_pages::OfflinePageModelFactory::GetForBrowserContext(
- GetProfile());
- return !offline_page_model->GetAllPages().empty();
-}
-
-void TabAndroid::ShowOfflinePages() {
- JNIEnv* env = base::android::AttachCurrentThread();
- Java_Tab_showOfflinePages(env, weak_java_tab_.get(env).obj());
-}
-
void TabAndroid::SwapTabContents(content::WebContents* old_contents,
content::WebContents* new_contents,
bool did_start_load,
@@ -769,6 +755,10 @@ void TabAndroid::LoadOriginalImage(JNIEnv* env, jobject obj) {
jlong TabAndroid::GetBookmarkId(JNIEnv* env,
jobject obj,
jboolean only_editable) {
+ return GetBookmarkIdHelper(only_editable);
+}
+
+int64_t TabAndroid::GetBookmarkIdHelper(bool only_editable) const {
GURL url = dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(
web_contents()->GetURL());
Profile* profile = GetProfile();
@@ -797,9 +787,51 @@ jlong TabAndroid::GetBookmarkId(JNIEnv* env,
return -1;
}
+bool TabAndroid::HasOfflinePages() const {
+ if (!offline_pages::IsOfflinePagesEnabled())
+ return false;
+ offline_pages::OfflinePageModel* offline_page_model =
+ offline_pages::OfflinePageModelFactory::GetForBrowserContext(
+ GetProfile());
+ return !offline_page_model->GetAllPages().empty();
+}
+
+void TabAndroid::ShowOfflinePages() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ Java_Tab_showOfflinePages(env, weak_java_tab_.get(env).obj());
+}
+
+void TabAndroid::LoadOfflineCopy(const GURL& url) {
+ if (!offline_pages::IsOfflinePagesEnabled())
+ return;
+
+ // Offline copy is only saved for a bookmarked page.
+ int64_t bookmark_id = GetBookmarkIdHelper(true);
+ if (bookmark_id == -1)
+ return;
+
+ offline_pages::OfflinePageModel* offline_page_model =
+ offline_pages::OfflinePageModelFactory::GetForBrowserContext(
+ GetProfile());
+ if (!offline_page_model)
+ return;
+
+ const offline_pages::OfflinePageItem* offline_page =
+ offline_page_model->GetPageByBookmarkId(bookmark_id);
+ if (!offline_page || offline_page->url != url)
+ return;
+
+ GURL offline_url = offline_page->GetOfflineURL();
+ if (!offline_url.is_valid())
+ return;
+
+ content::NavigationController::LoadURLParams load_params(offline_url);
+ web_contents()->GetController().LoadURLWithParams(load_params);
+}
+
jboolean TabAndroid::HasOfflineCopy(JNIEnv* env, jobject obj) {
// Offline copy is only saved for a bookmarked page.
- jlong bookmark_id = GetBookmarkId(env, obj, true);
+ int64_t bookmark_id = GetBookmarkIdHelper(true);
if (bookmark_id == -1)
return false;
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | chrome/browser/net/net_error_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698