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

Unified Diff: content/browser/browser_child_process_host.cc

Issue 6576020: Remove Gears from Chrome (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: windows fixes Created 9 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_child_process_host.cc
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc
index 51429431b926ba6b267eae44884467aec3e40014..04b6c49a41d5210e870bd2f246ab984ac1fbd36f 100644
--- a/content/browser/browser_child_process_host.cc
+++ b/content/browser/browser_child_process_host.cc
@@ -24,6 +24,7 @@
#include "chrome/installer/util/google_update_settings.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
+#include "content/browser/renderer_host/resource_message_filter.h"
#if defined(OS_LINUX)
#include "base/linux_util.h"
@@ -60,34 +61,13 @@ class ChildNotificationTask : public Task {
BrowserChildProcessHost::BrowserChildProcessHost(
ChildProcessInfo::ProcessType type,
- ResourceDispatcherHost* resource_dispatcher_host,
- ResourceMessageFilter::URLRequestContextOverride*
- url_request_context_override)
- : ChildProcessInfo(type, -1),
- ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
- resource_dispatcher_host_(resource_dispatcher_host) {
- Initialize(url_request_context_override);
-}
-
-BrowserChildProcessHost::BrowserChildProcessHost(
- ChildProcessInfo::ProcessType type,
ResourceDispatcherHost* resource_dispatcher_host)
: ChildProcessInfo(type, -1),
ALLOW_THIS_IN_INITIALIZER_LIST(client_(this)),
resource_dispatcher_host_(resource_dispatcher_host) {
- Initialize(NULL);
-}
-
-void BrowserChildProcessHost::Initialize(
- ResourceMessageFilter::URLRequestContextOverride*
- url_request_context_override) {
if (resource_dispatcher_host_) {
ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
- id(), type(), resource_dispatcher_host_);
- if (url_request_context_override) {
- resource_message_filter->set_url_request_context_override(
- url_request_context_override);
- }
+ id(), type, resource_dispatcher_host_);
AddFilter(resource_message_filter);
}
« no previous file with comments | « content/browser/browser_child_process_host.h ('k') | content/browser/geolocation/gps_location_provider_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698