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

Side by Side Diff: chrome/browser/net/net_error_tab_helper.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 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/net/net_error_tab_helper.h ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/net/net_error_tab_helper.h" 5 #include "chrome/browser/net/net_error_tab_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/io_thread.h" 11 #include "chrome/browser/io_thread.h"
12 #include "chrome/browser/net/dns_probe_service.h" 12 #include "chrome/browser/net/dns_probe_service.h"
13 #include "chrome/browser/net/net_error_diagnostics_dialog.h" 13 #include "chrome/browser/net/net_error_diagnostics_dialog.h"
14 #include "chrome/browser/platform_util.h" 14 #include "chrome/browser/platform_util.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/common/localized_error.h"
16 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
17 #include "chrome/common/render_messages.h" 18 #include "chrome/common/render_messages.h"
18 #include "components/error_page/common/net_error_info.h" 19 #include "components/error_page/common/net_error_info.h"
19 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/navigation_handle.h"
20 #include "content/public/browser/render_frame_host.h" 23 #include "content/public/browser/render_frame_host.h"
21 #include "ipc/ipc_message_macros.h" 24 #include "ipc/ipc_message_macros.h"
22 #include "net/base/net_errors.h" 25 #include "net/base/net_errors.h"
23 #include "url/gurl.h" 26 #include "url/gurl.h"
24 27
25 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
29 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
26 #include "chrome/browser/android/tab_android.h" 30 #include "chrome/browser/android/tab_android.h"
27 #endif 31 #include "components/offline_pages/offline_page_feature.h"
32 #include "components/offline_pages/offline_page_item.h"
33 #include "components/offline_pages/offline_page_model.h"
34 #endif // defined(OS_ANDROID)
28 35
29 using content::BrowserContext; 36 using content::BrowserContext;
30 using content::BrowserThread; 37 using content::BrowserThread;
31 using content::WebContents; 38 using content::WebContents;
32 using content::WebContentsObserver; 39 using content::WebContentsObserver;
33 using error_page::DnsProbeStatus; 40 using error_page::DnsProbeStatus;
34 using error_page::DnsProbeStatusToString; 41 using error_page::DnsProbeStatusToString;
42 using error_page::OfflinePageStatus;
35 using ui::PageTransition; 43 using ui::PageTransition;
36 44
37 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::NetErrorTabHelper); 45 DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome_browser_net::NetErrorTabHelper);
38 46
39 namespace chrome_browser_net { 47 namespace chrome_browser_net {
40 48
41 namespace { 49 namespace {
42 50
43 static NetErrorTabHelper::TestingState testing_state_ = 51 static NetErrorTabHelper::TestingState testing_state_ =
44 NetErrorTabHelper::TESTING_DEFAULT; 52 NetErrorTabHelper::TESTING_DEFAULT;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 bool is_error_page, 125 bool is_error_page,
118 bool is_iframe_srcdoc) { 126 bool is_iframe_srcdoc) {
119 DCHECK_CURRENTLY_ON(BrowserThread::UI); 127 DCHECK_CURRENTLY_ON(BrowserThread::UI);
120 128
121 if (render_frame_host->GetParent()) 129 if (render_frame_host->GetParent())
122 return; 130 return;
123 131
124 is_error_page_ = is_error_page; 132 is_error_page_ = is_error_page;
125 133
126 #if defined(OS_ANDROID) 134 #if defined(OS_ANDROID)
127 SetHasOfflinePages(render_frame_host); 135 SetOfflinePageInfo(render_frame_host, validated_url);
128 #endif 136 #endif // defined(OS_ANDROID)
129 } 137 }
130 138
131 void NetErrorTabHelper::DidCommitProvisionalLoadForFrame( 139 void NetErrorTabHelper::DidCommitProvisionalLoadForFrame(
132 content::RenderFrameHost* render_frame_host, 140 content::RenderFrameHost* render_frame_host,
133 const GURL& url, 141 const GURL& url,
134 PageTransition transition_type) { 142 PageTransition transition_type) {
135 DCHECK_CURRENTLY_ON(BrowserThread::UI); 143 DCHECK_CURRENTLY_ON(BrowserThread::UI);
136 144
137 if (render_frame_host->GetParent()) 145 if (render_frame_host->GetParent())
138 return; 146 return;
(...skipping 25 matching lines...) Expand all
164 172
165 if (IsDnsError(error_code)) { 173 if (IsDnsError(error_code)) {
166 dns_error_active_ = true; 174 dns_error_active_ = true;
167 OnMainFrameDnsError(); 175 OnMainFrameDnsError();
168 } 176 }
169 } 177 }
170 178
171 bool NetErrorTabHelper::OnMessageReceived( 179 bool NetErrorTabHelper::OnMessageReceived(
172 const IPC::Message& message, 180 const IPC::Message& message,
173 content::RenderFrameHost* render_frame_host) { 181 content::RenderFrameHost* render_frame_host) {
182 if (render_frame_host != web_contents()->GetMainFrame())
183 return false;
174 bool handled = true; 184 bool handled = true;
175 IPC_BEGIN_MESSAGE_MAP(NetErrorTabHelper, message) 185 IPC_BEGIN_MESSAGE_MAP(NetErrorTabHelper, message)
176 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RunNetworkDiagnostics, 186 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RunNetworkDiagnostics,
177 RunNetworkDiagnostics) 187 RunNetworkDiagnostics)
178 #if defined(OS_ANDROID) 188 #if defined(OS_ANDROID)
179 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowOfflinePages, ShowOfflinePages) 189 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ShowOfflinePages, ShowOfflinePages)
180 #endif 190 IPC_MESSAGE_HANDLER(ChromeViewHostMsg_LoadOfflineCopy, LoadOfflineCopy)
191 #endif // defined(OS_ANDROID)
181 IPC_MESSAGE_UNHANDLED(handled = false) 192 IPC_MESSAGE_UNHANDLED(handled = false)
182 IPC_END_MESSAGE_MAP() 193 IPC_END_MESSAGE_MAP()
183 194
184 return handled; 195 return handled;
185 } 196 }
186 197
187 NetErrorTabHelper::NetErrorTabHelper(WebContents* contents) 198 NetErrorTabHelper::NetErrorTabHelper(WebContents* contents)
188 : WebContentsObserver(contents), 199 : WebContentsObserver(contents),
189 is_error_page_(false), 200 is_error_page_(false),
190 dns_error_active_(false), 201 dns_error_active_(false),
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 // Sanitize URL prior to running diagnostics on it. 290 // Sanitize URL prior to running diagnostics on it.
280 RunNetworkDiagnosticsHelper(url.GetOrigin().spec()); 291 RunNetworkDiagnosticsHelper(url.GetOrigin().spec());
281 } 292 }
282 293
283 void NetErrorTabHelper::RunNetworkDiagnosticsHelper( 294 void NetErrorTabHelper::RunNetworkDiagnosticsHelper(
284 const std::string& sanitized_url) { 295 const std::string& sanitized_url) {
285 ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url); 296 ShowNetworkDiagnosticsDialog(web_contents(), sanitized_url);
286 } 297 }
287 298
288 #if defined(OS_ANDROID) 299 #if defined(OS_ANDROID)
289 void NetErrorTabHelper::SetHasOfflinePages( 300 void NetErrorTabHelper::SetOfflinePageInfo(
290 content::RenderFrameHost* render_frame_host) { 301 content::RenderFrameHost* render_frame_host,
291 DCHECK(web_contents()); 302 const GURL& url) {
292 TabAndroid* tab = TabAndroid::FromWebContents(web_contents()); 303 // Bails out if offline pages not supported.
293 bool has_offline_pages = tab && tab->HasOfflinePages(); 304 if (!offline_pages::IsOfflinePagesEnabled())
294 render_frame_host->Send( 305 return;
295 new ChromeViewMsg_SetHasOfflinePages( 306
296 render_frame_host->GetRoutingID(), 307 offline_pages::OfflinePageModel* offline_page_model =
297 has_offline_pages)); 308 offline_pages::OfflinePageModelFactory::GetForBrowserContext(
309 web_contents()->GetBrowserContext());
310 if (!offline_page_model)
311 return;
312
313 OfflinePageStatus status = OfflinePageStatus::NONE;
314 if (offline_page_model->HasOfflinePages()) {
315 status = offline_page_model->GetPageByOnlineURL(url)
316 ? OfflinePageStatus::HAS_OFFLINE_PAGE
317 : OfflinePageStatus::HAS_OTHER_OFFLINE_PAGES;
318 }
319 render_frame_host->Send(new ChromeViewMsg_SetOfflinePageInfo(
320 render_frame_host->GetRoutingID(), status));
298 } 321 }
299 322
300 void NetErrorTabHelper::ShowOfflinePages() { 323 void NetErrorTabHelper::ShowOfflinePages() {
324 // Makes sure that this is coming from an error page.
325 if (!IsFromErrorPage())
326 return;
327
301 DCHECK(web_contents()); 328 DCHECK(web_contents());
302 TabAndroid* tab = TabAndroid::FromWebContents(web_contents()); 329 TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
303 if (tab) 330 if (tab)
304 tab->ShowOfflinePages(); 331 tab->ShowOfflinePages();
305 } 332 }
306 #endif 333
334 void NetErrorTabHelper::LoadOfflineCopy(const GURL& url) {
335 // Makes sure that this is coming from an error page.
336 if (!IsFromErrorPage())
337 return;
338
339 GURL validated_url(url);
340 if (!validated_url.is_valid())
341 return;
342
343 if (validated_url != web_contents()->GetLastCommittedURL())
344 return;
345
346 TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
347 if (tab)
348 tab->LoadOfflineCopy(url);
349 }
350
351 bool NetErrorTabHelper::IsFromErrorPage() const {
352 content::NavigationEntry* entry =
353 web_contents()->GetController().GetLastCommittedEntry();
354 return entry && (entry->GetPageType() == content::PAGE_TYPE_ERROR);
355 }
356
357 #endif // defined(OS_ANDROID)
307 358
308 } // namespace chrome_browser_net 359 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/net_error_tab_helper.h ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698