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

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

Issue 11830043: Move content/components/navigation_interception to src/components (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 11 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/chrome_jni_registrar.cc ('k') | chrome/chrome.gyp » ('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/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h" 48 #include "chrome/browser/managed_mode/managed_mode_resource_throttle.h"
49 #endif 49 #endif
50 50
51 #if defined(USE_SYSTEM_PROTOBUF) 51 #if defined(USE_SYSTEM_PROTOBUF)
52 #include <google/protobuf/repeated_field.h> 52 #include <google/protobuf/repeated_field.h>
53 #else 53 #else
54 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" 54 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
55 #endif 55 #endif
56 56
57 #if defined(OS_ANDROID) 57 #if defined(OS_ANDROID)
58 #include "content/components/navigation_interception/intercept_navigation_delega te.h" 58 #include "components/navigation_interception/intercept_navigation_delegate.h"
59 #endif 59 #endif
60 60
61 #if defined(OS_CHROMEOS) 61 #if defined(OS_CHROMEOS)
62 #include "chrome/browser/chromeos/extensions/file_browser_resource_throttle.h" 62 #include "chrome/browser/chromeos/extensions/file_browser_resource_throttle.h"
63 // TODO(oshima): Enable this for other platforms. 63 // TODO(oshima): Enable this for other platforms.
64 #include "chrome/browser/renderer_host/offline_resource_throttle.h" 64 #include "chrome/browser/renderer_host/offline_resource_throttle.h"
65 #endif 65 #endif
66 66
67 using content::BrowserThread; 67 using content::BrowserThread;
68 using content::RenderViewHost; 68 using content::RenderViewHost;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 bool is_prerendering = prerender_tracker_->IsPrerenderingOnIOThread( 146 bool is_prerendering = prerender_tracker_->IsPrerenderingOnIOThread(
147 child_id, route_id); 147 child_id, route_id);
148 if (is_prerendering) { 148 if (is_prerendering) {
149 user_data->set_is_prerender(true); 149 user_data->set_is_prerender(true);
150 request->set_priority(net::IDLE); 150 request->set_priority(net::IDLE);
151 } 151 }
152 152
153 #if defined(OS_ANDROID) 153 #if defined(OS_ANDROID)
154 if (!is_prerendering && resource_type == ResourceType::MAIN_FRAME) { 154 if (!is_prerendering && resource_type == ResourceType::MAIN_FRAME) {
155 throttles->push_back( 155 throttles->push_back(
156 content::InterceptNavigationDelegate::CreateThrottleFor( 156 components::InterceptNavigationDelegate::CreateThrottleFor(request));
157 request));
158 } 157 }
159 #endif 158 #endif
160 #if defined(OS_CHROMEOS) 159 #if defined(OS_CHROMEOS)
161 if (resource_type == ResourceType::MAIN_FRAME) { 160 if (resource_type == ResourceType::MAIN_FRAME) {
162 // We check offline first, then check safe browsing so that we still can 161 // We check offline first, then check safe browsing so that we still can
163 // block unsafe site after we remove offline page. 162 // block unsafe site after we remove offline page.
164 throttles->push_back(new OfflineResourceThrottle( 163 throttles->push_back(new OfflineResourceThrottle(
165 child_id, route_id, request, appcache_service)); 164 child_id, route_id, request, appcache_service));
166 } 165 }
167 #endif 166 #endif
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(), 443 OneClickSigninHelper::ShowInfoBarIfPossible(request, info->GetChildID(),
445 info->GetRouteID()); 444 info->GetRouteID());
446 #endif 445 #endif
447 446
448 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context); 447 ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
449 if (io_data->resource_prefetch_predictor_observer()) { 448 if (io_data->resource_prefetch_predictor_observer()) {
450 io_data->resource_prefetch_predictor_observer()->OnRequestRedirected( 449 io_data->resource_prefetch_predictor_observer()->OnRequestRedirected(
451 redirect_url, request); 450 redirect_url, request);
452 } 451 }
453 } 452 }
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698