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

Side by Side Diff: android_webview/browser/renderer_host/aw_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 | « android_webview/browser/DEPS ('k') | android_webview/java/DEPS » ('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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h" 5 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_dele gate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "android_webview/browser/aw_contents_io_thread_client.h" 9 #include "android_webview/browser/aw_contents_io_thread_client.h"
10 #include "android_webview/browser/aw_login_delegate.h" 10 #include "android_webview/browser/aw_login_delegate.h"
11 #include "android_webview/common/url_constants.h" 11 #include "android_webview/common/url_constants.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "content/components/navigation_interception/intercept_navigation_delega te.h" 14 #include "components/navigation_interception/intercept_navigation_delegate.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/resource_controller.h" 16 #include "content/public/browser/resource_controller.h"
17 #include "content/public/browser/resource_dispatcher_host.h" 17 #include "content/public/browser/resource_dispatcher_host.h"
18 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" 18 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
19 #include "content/public/browser/resource_throttle.h" 19 #include "content/public/browser/resource_throttle.h"
20 #include "content/public/common/url_constants.h" 20 #include "content/public/common/url_constants.h"
21 #include "net/base/load_flags.h" 21 #include "net/base/load_flags.h"
22 #include "net/url_request/url_request.h" 22 #include "net/url_request/url_request.h"
23 23
24 using android_webview::AwContentsIoThreadClient; 24 using android_webview::AwContentsIoThreadClient;
25 using components::InterceptNavigationDelegate;
25 using content::BrowserThread; 26 using content::BrowserThread;
26 using content::InterceptNavigationDelegate;
27 27
28 namespace { 28 namespace {
29 29
30 base::LazyInstance<android_webview::AwResourceDispatcherHostDelegate> 30 base::LazyInstance<android_webview::AwResourceDispatcherHostDelegate>
31 g_webview_resource_dispatcher_host_delegate = LAZY_INSTANCE_INITIALIZER; 31 g_webview_resource_dispatcher_host_delegate = LAZY_INSTANCE_INITIALIZER;
32 32
33 void SetCacheControlFlag( 33 void SetCacheControlFlag(
34 net::URLRequest* request, int flag) { 34 net::URLRequest* request, int flag) {
35 const int all_cache_control_flags = net::LOAD_BYPASS_CACHE | 35 const int all_cache_control_flags = net::LOAD_BYPASS_CACHE |
36 net::LOAD_VALIDATE_CACHE | 36 net::LOAD_VALIDATE_CACHE |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 ChildRouteIDPair(new_child_id, new_route_id)); 341 ChildRouteIDPair(new_child_id, new_route_id));
342 342
343 if (it != pending_throttles_.end()) { 343 if (it != pending_throttles_.end()) {
344 IoThreadClientThrottle* throttle = it->second; 344 IoThreadClientThrottle* throttle = it->second;
345 throttle->OnIoThreadClientReady(new_child_id, new_route_id); 345 throttle->OnIoThreadClientReady(new_child_id, new_route_id);
346 pending_throttles_.erase(it); 346 pending_throttles_.erase(it);
347 } 347 }
348 } 348 }
349 349
350 } // namespace android_webview 350 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/browser/DEPS ('k') | android_webview/java/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698