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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed bug + latest master Created 8 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
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/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
12 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 12 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
13 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 13 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
14 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 14 #include "chrome/browser/extensions/event_router_forwarder.h"
15 #include "chrome/browser/extensions/extension_info_map.h" 15 #include "chrome/browser/extensions/extension_info_map.h"
16 #include "chrome/browser/extensions/extension_process_manager.h" 16 #include "chrome/browser/extensions/extension_process_manager.h"
17 #include "chrome/browser/prefs/pref_member.h" 17 #include "chrome/browser/prefs/pref_member.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/task_manager/task_manager.h" 19 #include "chrome/browser/task_manager/task_manager.h"
20 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
21 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/render_view_host.h" 23 #include "content/public/browser/render_view_host.h"
24 #include "content/public/browser/resource_request_info.h" 24 #include "content/public/browser/resource_request_info.h"
(...skipping 25 matching lines...) Expand all
50 bool ChromeNetworkDelegate::g_allow_file_access_ = false; 50 bool ChromeNetworkDelegate::g_allow_file_access_ = false;
51 #else 51 #else
52 bool ChromeNetworkDelegate::g_allow_file_access_ = true; 52 bool ChromeNetworkDelegate::g_allow_file_access_ = true;
53 #endif 53 #endif
54 54
55 namespace { 55 namespace {
56 56
57 // If the |request| failed due to problems with a proxy, forward the error to 57 // If the |request| failed due to problems with a proxy, forward the error to
58 // the proxy extension API. 58 // the proxy extension API.
59 void ForwardProxyErrors(net::URLRequest* request, 59 void ForwardProxyErrors(net::URLRequest* request,
60 ExtensionEventRouterForwarder* event_router, 60 extensions::EventRouterForwarder* event_router,
61 void* profile) { 61 void* profile) {
62 if (request->status().status() == net::URLRequestStatus::FAILED) { 62 if (request->status().status() == net::URLRequestStatus::FAILED) {
63 switch (request->status().error()) { 63 switch (request->status().error()) {
64 case net::ERR_PROXY_AUTH_UNSUPPORTED: 64 case net::ERR_PROXY_AUTH_UNSUPPORTED:
65 case net::ERR_PROXY_CONNECTION_FAILED: 65 case net::ERR_PROXY_CONNECTION_FAILED:
66 case net::ERR_TUNNEL_CONNECTION_FAILED: 66 case net::ERR_TUNNEL_CONNECTION_FAILED:
67 extensions::ProxyEventRouter::GetInstance()->OnProxyError( 67 extensions::ProxyEventRouter::GetInstance()->OnProxyError(
68 event_router, profile, request->status().error()); 68 event_router, profile, request->status().error());
69 } 69 }
70 } 70 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (info->GetAssociatedRenderView(&process_id, &render_view_id)) { 114 if (info->GetAssociatedRenderView(&process_id, &render_view_id)) {
115 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 115 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
116 base::Bind(&NotifyEPMRequestStatus, 116 base::Bind(&NotifyEPMRequestStatus,
117 status, profile_id, process_id, render_view_id)); 117 status, profile_id, process_id, render_view_id));
118 } 118 }
119 } 119 }
120 120
121 } // namespace 121 } // namespace
122 122
123 ChromeNetworkDelegate::ChromeNetworkDelegate( 123 ChromeNetworkDelegate::ChromeNetworkDelegate(
124 ExtensionEventRouterForwarder* event_router, 124 extensions::EventRouterForwarder* event_router,
125 ExtensionInfoMap* extension_info_map, 125 ExtensionInfoMap* extension_info_map,
126 const policy::URLBlacklistManager* url_blacklist_manager, 126 const policy::URLBlacklistManager* url_blacklist_manager,
127 void* profile, 127 void* profile,
128 CookieSettings* cookie_settings, 128 CookieSettings* cookie_settings,
129 BooleanPrefMember* enable_referrers) 129 BooleanPrefMember* enable_referrers)
130 : event_router_(event_router), 130 : event_router_(event_router),
131 profile_(profile), 131 profile_(profile),
132 cookie_settings_(cookie_settings), 132 cookie_settings_(cookie_settings),
133 extension_info_map_(extension_info_map), 133 extension_info_map_(extension_info_map),
134 enable_referrers_(enable_referrers), 134 enable_referrers_(enable_referrers),
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // URL access blocked by policy. 382 // URL access blocked by policy.
383 socket->net_log()->AddEvent( 383 socket->net_log()->AddEvent(
384 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, 384 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
385 net::NetLog::StringCallback("url", 385 net::NetLog::StringCallback("url",
386 &socket->url().possibly_invalid_spec())); 386 &socket->url().possibly_invalid_spec()));
387 return net::ERR_NETWORK_ACCESS_DENIED; 387 return net::ERR_NETWORK_ACCESS_DENIED;
388 } 388 }
389 #endif 389 #endif
390 return net::OK; 390 return net::OK;
391 } 391 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | chrome/browser/profiles/off_the_record_profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698