Commit 49dccd06 authored by thestig@chromium.org's avatar thestig@chromium.org

Cleanup: Change some !OS_ANDROID #ifdefs to ENABLE_EXTENSIONS in...

Cleanup: Change some !OS_ANDROID #ifdefs to ENABLE_EXTENSIONS in ChromeResourceDispatcherHostDelegate.

Review URL: https://codereview.chromium.org/405493002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283954 0039d316-1c4b-4281-b951-d872f2087c98
parent e98d982c
...@@ -162,7 +162,7 @@ void UpdatePrerenderNetworkBytesCallback(int render_process_id, ...@@ -162,7 +162,7 @@ void UpdatePrerenderNetworkBytesCallback(int render_process_id,
prerender_manager->AddProfileNetworkBytesIfEnabled(bytes); prerender_manager->AddProfileNetworkBytesIfEnabled(bytes);
} }
#if !defined(OS_ANDROID) #if defined(ENABLE_EXTENSIONS)
void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamHandle> stream, void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamHandle> stream,
int64 expected_content_size, int64 expected_content_size,
int render_process_id, int render_process_id,
...@@ -195,7 +195,9 @@ void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamHandle> stream, ...@@ -195,7 +195,9 @@ void SendExecuteMimeTypeHandlerEvent(scoped_ptr<content::StreamHandle> stream,
extension_id, web_contents, stream.Pass(), view_id, extension_id, web_contents, stream.Pass(), view_id,
expected_content_size); expected_content_size);
} }
#endif // !defined(ENABLE_EXTENSIONS)
#if !defined(OS_ANDROID)
void LaunchURL(const GURL& url, int render_process_id, int render_view_id, void LaunchURL(const GURL& url, int render_process_id, int render_view_id,
bool user_gesture) { bool user_gesture) {
// If there is no longer a WebContents, the request may have raced with tab // If there is no longer a WebContents, the request may have raced with tab
...@@ -565,7 +567,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream( ...@@ -565,7 +567,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
const std::string& mime_type, const std::string& mime_type,
GURL* origin, GURL* origin,
std::string* payload) { std::string* payload) {
#if !defined(OS_ANDROID) #if defined(ENABLE_EXTENSIONS)
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
ProfileIOData* io_data = ProfileIOData* io_data =
ProfileIOData::FromResourceContext(info->GetContext()); ProfileIOData::FromResourceContext(info->GetContext());
...@@ -608,7 +610,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream( ...@@ -608,7 +610,7 @@ bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
void ChromeResourceDispatcherHostDelegate::OnStreamCreated( void ChromeResourceDispatcherHostDelegate::OnStreamCreated(
net::URLRequest* request, net::URLRequest* request,
scoped_ptr<content::StreamHandle> stream) { scoped_ptr<content::StreamHandle> stream) {
#if !defined(OS_ANDROID) #if defined(ENABLE_EXTENSIONS)
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request); const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
std::map<net::URLRequest*, StreamTargetInfo>::iterator ix = std::map<net::URLRequest*, StreamTargetInfo>::iterator ix =
stream_target_info_.find(request); stream_target_info_.find(request);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment