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

Side by Side Diff: chrome/browser/renderer_host/offline_resource_handler.cc

Issue 7969009: Removed chromeos::NetworkStateNotifier and redirected all related code to use (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/renderer_host/offline_resource_handler.h" 5 #include "chrome/browser/renderer_host/offline_resource_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "chrome/browser/chromeos/network_state_notifier.h"
14 #include "chrome/browser/chromeos/offline/offline_load_page.h" 13 #include "chrome/browser/chromeos/offline/offline_load_page.h"
15 #include "chrome/browser/net/chrome_url_request_context.h" 14 #include "chrome/browser/net/chrome_url_request_context.h"
16 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
17 #include "content/browser/appcache/chrome_appcache_service.h" 16 #include "content/browser/appcache/chrome_appcache_service.h"
18 #include "content/browser/browser_thread.h" 17 #include "content/browser/browser_thread.h"
19 #include "content/browser/renderer_host/resource_dispatcher_host.h" 18 #include "content/browser/renderer_host/resource_dispatcher_host.h"
20 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 19 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
21 #include "net/base/net_errors.h" 20 #include "net/base/net_errors.h"
21 #include "net/base/network_change_notifier.h"
22 #include "net/url_request/url_request.h" 22 #include "net/url_request/url_request.h"
23 #include "net/url_request/url_request_context.h" 23 #include "net/url_request/url_request_context.h"
24 24
25 OfflineResourceHandler::OfflineResourceHandler( 25 OfflineResourceHandler::OfflineResourceHandler(
26 ResourceHandler* handler, 26 ResourceHandler* handler,
27 int host_id, 27 int host_id,
28 int route_id, 28 int route_id,
29 ResourceDispatcherHost* rdh, 29 ResourceDispatcherHost* rdh,
30 net::URLRequest* request, 30 net::URLRequest* request,
31 ChromeAppCacheService* appcache_service) 31 ChromeAppCacheService* appcache_service)
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 bool OfflineResourceHandler::IsRemote(const GURL& url) const { 165 bool OfflineResourceHandler::IsRemote(const GURL& url) const {
166 return url.SchemeIs(chrome::kFtpScheme) || 166 return url.SchemeIs(chrome::kFtpScheme) ||
167 url.SchemeIs(chrome::kHttpScheme) || 167 url.SchemeIs(chrome::kHttpScheme) ||
168 url.SchemeIs(chrome::kHttpsScheme); 168 url.SchemeIs(chrome::kHttpsScheme);
169 } 169 }
170 170
171 bool OfflineResourceHandler::ShouldShowOfflinePage(const GURL& url) const { 171 bool OfflineResourceHandler::ShouldShowOfflinePage(const GURL& url) const {
172 // Only check main frame. If the network is disconnected while 172 // Only check main frame. If the network is disconnected while
173 // loading other resources, we'll simply show broken link/images. 173 // loading other resources, we'll simply show broken link/images.
174 return IsRemote(url) && 174 return IsRemote(url) &&
175 !chromeos::NetworkStateNotifier::is_connected() && 175 net::NetworkChangeNotifier::IsOffline() &&
176 ResourceDispatcherHost::InfoForRequest(request_)->resource_type() 176 ResourceDispatcherHost::InfoForRequest(request_)->resource_type()
177 == ResourceType::MAIN_FRAME; 177 == ResourceType::MAIN_FRAME;
178 } 178 }
179 179
180 void OfflineResourceHandler::Resume() { 180 void OfflineResourceHandler::Resume() {
181 const GURL url = deferred_url_; 181 const GURL url = deferred_url_;
182 int request_id = deferred_request_id_; 182 int request_id = deferred_request_id_;
183 ClearRequestInfo(); 183 ClearRequestInfo();
184 184
185 bool defer = false; 185 bool defer = false;
186 DVLOG(1) << "Resume load: this=" << this << ", request id=" << request_id; 186 DVLOG(1) << "Resume load: this=" << this << ", request id=" << request_id;
187 next_handler_->OnWillStart(request_id, url, &defer); 187 next_handler_->OnWillStart(request_id, url, &defer);
188 if (!defer) 188 if (!defer)
189 rdh_->StartDeferredRequest(process_host_id_, request_id); 189 rdh_->StartDeferredRequest(process_host_id_, request_id);
190 } 190 }
191 191
192 void OfflineResourceHandler::ShowOfflinePage() { 192 void OfflineResourceHandler::ShowOfflinePage() {
193 chromeos::OfflineLoadPage::Show( 193 chromeos::OfflineLoadPage::Show(
194 process_host_id_, render_view_id_, deferred_url_, this); 194 process_host_id_, render_view_id_, deferred_url_, this);
195 } 195 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/web_socket_proxy_controller.cc ('k') | chrome/browser/sessions/session_restore.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698