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

Side by Side Diff: chrome/browser/android/offline_pages/offline_page_tab_helper.h

Issue 2040163003: Refactors offline page tab helper to stash the offline page item on redirect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@single-result
Patch Set: Add a dedicated test. Created 4 years, 6 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_
6 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_ 6 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "components/offline_pages/offline_page_types.h"
10 #include "content/public/browser/web_contents_observer.h" 11 #include "content/public/browser/web_contents_observer.h"
11 #include "content/public/browser/web_contents_user_data.h" 12 #include "content/public/browser/web_contents_user_data.h"
12 #include "url/gurl.h" 13 #include "url/gurl.h"
13 14
14 namespace content { 15 namespace content {
15 class WebContents; 16 class WebContents;
16 } 17 }
17 18
18 namespace offline_pages { 19 namespace offline_pages {
20 struct OfflinePageItem;
19 21
20 // Per-tab class to manage switch between online version and offline version. 22 // Per-tab class to manage switch between online version and offline version.
21 class OfflinePageTabHelper : 23 class OfflinePageTabHelper :
22 public content::WebContentsObserver, 24 public content::WebContentsObserver,
23 public content::WebContentsUserData<OfflinePageTabHelper> { 25 public content::WebContentsUserData<OfflinePageTabHelper> {
24 public: 26 public:
25 ~OfflinePageTabHelper() override; 27 ~OfflinePageTabHelper() override;
26 28
27 private: 29 private:
30 enum class RedirectReason {
31 DISCONNECTED_NETWORK,
32 FLAKY_NETWORK,
33 FLAKY_NETWORK_FORWARD_BACK
34 };
35
28 friend class content::WebContentsUserData<OfflinePageTabHelper>; 36 friend class content::WebContentsUserData<OfflinePageTabHelper>;
29 friend class OfflinePageTabHelperTest; 37 friend class OfflinePageTabHelperTest;
30 FRIEND_TEST_ALL_PREFIXES(OfflinePageTabHelperTest, 38 FRIEND_TEST_ALL_PREFIXES(OfflinePageTabHelperTest,
31 NewNavigationCancelsPendingRedirects); 39 NewNavigationCancelsPendingRedirects);
32 40
33 explicit OfflinePageTabHelper(content::WebContents* web_contents); 41 explicit OfflinePageTabHelper(content::WebContents* web_contents);
34 42
35 // Overridden from content::WebContentsObserver: 43 // Overridden from content::WebContentsObserver:
36 void DidStartNavigation( 44 void DidStartNavigation(
37 content::NavigationHandle* navigation_handle) override; 45 content::NavigationHandle* navigation_handle) override;
38 void DidFinishNavigation( 46 void DidFinishNavigation(
39 content::NavigationHandle* navigation_handle) override; 47 content::NavigationHandle* navigation_handle) override;
40 48
41 void GotRedirectURLForSupportedErrorCode(ui::PageTransition transition, 49 void RedirectToOnline(const GURL& from_url,
42 const GURL& from_url, 50 const OfflinePageItem* offline_page);
43 const GURL& redirect_url); 51 void TryRedirectToOffline(RedirectReason redirect_reason,
44 void GotRedirectURLForStartedNavigation(const GURL& from_url, 52 const GURL& from_url,
45 const GURL& redirect_url); 53 const OfflinePageItem* offline_page);
46 54
47 void Redirect(const GURL& from_url, const GURL& to_url); 55 void Redirect(const GURL& from_url,
56 const GURL& to_url,
57 const OfflinePageItem* offline_page);
48 58
49 base::WeakPtrFactory<OfflinePageTabHelper> weak_ptr_factory_; 59 base::WeakPtrFactory<OfflinePageTabHelper> weak_ptr_factory_;
50 60
51 DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelper); 61 DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelper);
52 }; 62 };
53 63
54 } // namespace offline_pages 64 } // namespace offline_pages
55 65
56 #endif // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_ 66 #endif // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_TAB_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698