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/tab_android.cc

Issue 2838773002: Move offline related functions from Tab to OfflinePageUtils (Closed)
Patch Set: Fix tests Created 3 years, 7 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
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/tab_android.h" 5 #include "chrome/browser/android/tab_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/metrics/histogram_macros.h" 12 #include "base/metrics/histogram_macros.h"
13 #include "base/metrics/user_metrics.h" 13 #include "base/metrics/user_metrics.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "cc/layers/layer.h" 15 #include "cc/layers/layer.h"
16 #include "chrome/browser/android/compositor/tab_content_manager.h" 16 #include "chrome/browser/android/compositor/tab_content_manager.h"
17 #include "chrome/browser/android/metrics/uma_utils.h" 17 #include "chrome/browser/android/metrics/uma_utils.h"
18 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
19 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
20 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
21 #include "chrome/browser/android/tab_web_contents_delegate_android.h" 18 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
22 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 19 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
23 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 20 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
24 #include "chrome/browser/browser_about_handler.h" 21 #include "chrome/browser/browser_about_handler.h"
25 #include "chrome/browser/chrome_notification_types.h" 22 #include "chrome/browser/chrome_notification_types.h"
26 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 23 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
27 #include "chrome/browser/infobars/infobar_service.h" 24 #include "chrome/browser/infobars/infobar_service.h"
28 #include "chrome/browser/prerender/prerender_contents.h" 25 #include "chrome/browser/prerender/prerender_contents.h"
29 #include "chrome/browser/prerender/prerender_manager.h" 26 #include "chrome/browser/prerender/prerender_manager.h"
30 #include "chrome/browser/prerender/prerender_manager_factory.h" 27 #include "chrome/browser/prerender/prerender_manager_factory.h"
(...skipping 19 matching lines...) Expand all
50 #include "chrome/common/render_messages.h" 47 #include "chrome/common/render_messages.h"
51 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
52 #include "components/bookmarks/browser/bookmark_model.h" 49 #include "components/bookmarks/browser/bookmark_model.h"
53 #include "components/bookmarks/browser/bookmark_node.h" 50 #include "components/bookmarks/browser/bookmark_node.h"
54 #include "components/bookmarks/browser/bookmark_utils.h" 51 #include "components/bookmarks/browser/bookmark_utils.h"
55 #include "components/bookmarks/managed/managed_bookmark_service.h" 52 #include "components/bookmarks/managed/managed_bookmark_service.h"
56 #include "components/dom_distiller/core/url_utils.h" 53 #include "components/dom_distiller/core/url_utils.h"
57 #include "components/favicon/content/content_favicon_driver.h" 54 #include "components/favicon/content/content_favicon_driver.h"
58 #include "components/navigation_interception/intercept_navigation_delegate.h" 55 #include "components/navigation_interception/intercept_navigation_delegate.h"
59 #include "components/navigation_interception/navigation_params.h" 56 #include "components/navigation_interception/navigation_params.h"
60 #include "components/offline_pages/core/offline_page_feature.h"
61 #include "components/offline_pages/core/offline_page_item.h"
62 #include "components/offline_pages/core/offline_page_model.h"
63 #include "components/sessions/content/content_live_tab.h" 57 #include "components/sessions/content/content_live_tab.h"
64 #include "components/sessions/core/tab_restore_service.h" 58 #include "components/sessions/core/tab_restore_service.h"
65 #include "components/url_formatter/url_fixer.h" 59 #include "components/url_formatter/url_fixer.h"
66 #include "content/public/browser/android/compositor.h" 60 #include "content/public/browser/android/compositor.h"
67 #include "content/public/browser/browser_thread.h" 61 #include "content/public/browser/browser_thread.h"
68 #include "content/public/browser/devtools_agent_host.h" 62 #include "content/public/browser/devtools_agent_host.h"
69 #include "content/public/browser/interstitial_page.h" 63 #include "content/public/browser/interstitial_page.h"
70 #include "content/public/browser/navigation_entry.h" 64 #include "content/public/browser/navigation_entry.h"
71 #include "content/public/browser/notification_service.h" 65 #include "content/public/browser/notification_service.h"
72 #include "content/public/browser/render_frame_host.h" 66 #include "content/public/browser/render_frame_host.h"
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 // Return the first node matching the search criteria. 682 // Return the first node matching the search criteria.
689 for (size_t i = 0; i < nodes.size(); ++i) { 683 for (size_t i = 0; i < nodes.size(); ++i) {
690 if (only_editable && !managed->CanBeEditedByUser(nodes[i])) 684 if (only_editable && !managed->CanBeEditedByUser(nodes[i]))
691 continue; 685 continue;
692 return nodes[i]->id(); 686 return nodes[i]->id();
693 } 687 }
694 688
695 return -1; 689 return -1;
696 } 690 }
697 691
698 void TabAndroid::ShowOfflinePages() {
699 JNIEnv* env = base::android::AttachCurrentThread();
700 Java_Tab_showOfflinePages(env, weak_java_tab_.get(env));
701 }
702
703 jboolean TabAndroid::IsOfflinePage(JNIEnv* env,
704 const JavaParamRef<jobject>& obj) {
705 return offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
706 web_contents()) != nullptr;
707 }
708
709 ScopedJavaLocalRef<jobject> TabAndroid::GetOfflinePage(
710 JNIEnv* env,
711 const JavaParamRef<jobject>& obj) {
712 const offline_pages::OfflinePageItem* offline_page =
713 offline_pages::OfflinePageUtils::GetOfflinePageFromWebContents(
714 web_contents());
715 if (!offline_page)
716 return ScopedJavaLocalRef<jobject>();
717
718 return offline_pages::android::OfflinePageBridge::ConvertToJavaOfflinePage(
719 env, *offline_page);
720 }
721
722 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env, 692 bool TabAndroid::HasPrerenderedUrl(JNIEnv* env,
723 const JavaParamRef<jobject>& obj, 693 const JavaParamRef<jobject>& obj,
724 const JavaParamRef<jstring>& url) { 694 const JavaParamRef<jstring>& url) {
725 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url)); 695 GURL gurl(base::android::ConvertJavaStringToUTF8(env, url));
726 return HasPrerenderedUrl(gurl); 696 return HasPrerenderedUrl(gurl);
727 } 697 }
728 698
729 void TabAndroid::EnableEmbeddedMediaExperience( 699 void TabAndroid::EnableEmbeddedMediaExperience(
730 JNIEnv* env, 700 JNIEnv* env,
731 const base::android::JavaParamRef<jobject>& obj, 701 const base::android::JavaParamRef<jobject>& obj,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { 780 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
811 TRACE_EVENT0("native", "TabAndroid::Init"); 781 TRACE_EVENT0("native", "TabAndroid::Init");
812 // This will automatically bind to the Java object and pass ownership there. 782 // This will automatically bind to the Java object and pass ownership there.
813 new TabAndroid(env, obj); 783 new TabAndroid(env, obj);
814 } 784 }
815 785
816 // static 786 // static
817 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { 787 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
818 return RegisterNativesImpl(env); 788 return RegisterNativesImpl(env);
819 } 789 }
OLDNEW
« no previous file with comments | « chrome/browser/android/tab_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698