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

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

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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) 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 #include <vector> 8 #include <vector>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #if defined(OS_CHROMEOS) 89 #if defined(OS_CHROMEOS)
90 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h" 90 #include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"
91 // TODO(oshima): Enable this for other platforms. 91 // TODO(oshima): Enable this for other platforms.
92 #include "chrome/browser/renderer_host/offline_resource_throttle.h" 92 #include "chrome/browser/renderer_host/offline_resource_throttle.h"
93 #endif 93 #endif
94 94
95 using content::BrowserThread; 95 using content::BrowserThread;
96 using content::RenderViewHost; 96 using content::RenderViewHost;
97 using content::ResourceDispatcherHostLoginDelegate; 97 using content::ResourceDispatcherHostLoginDelegate;
98 using content::ResourceRequestInfo; 98 using content::ResourceRequestInfo;
99 using content::ResourceType;
99 using extensions::Extension; 100 using extensions::Extension;
100 using extensions::StreamsPrivateAPI; 101 using extensions::StreamsPrivateAPI;
101 102
102 #if defined(OS_ANDROID) 103 #if defined(OS_ANDROID)
103 using navigation_interception::InterceptNavigationDelegate; 104 using navigation_interception::InterceptNavigationDelegate;
104 #endif 105 #endif
105 106
106 namespace { 107 namespace {
107 108
108 ExternalProtocolHandler::Delegate* g_external_protocol_handler_delegate = NULL; 109 ExternalProtocolHandler::Delegate* g_external_protocol_handler_delegate = NULL;
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 url_request->GetTotalReceivedBytes())); 719 url_request->GetTotalReceivedBytes()));
719 } 720 }
720 } 721 }
721 722
722 // static 723 // static
723 void ChromeResourceDispatcherHostDelegate:: 724 void ChromeResourceDispatcherHostDelegate::
724 SetExternalProtocolHandlerDelegateForTesting( 725 SetExternalProtocolHandlerDelegateForTesting(
725 ExternalProtocolHandler::Delegate* delegate) { 726 ExternalProtocolHandler::Delegate* delegate) {
726 g_external_protocol_handler_delegate = delegate; 727 g_external_protocol_handler_delegate = delegate;
727 } 728 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698