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

Unified Diff: content/browser/renderer_host/socket_stream_dispatcher_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/renderer_host/socket_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index ce6c85589179ef95c77b6240342a3881250a6858..c1e6ad43543f4cbbc074cf6c0854d1cbdfd91e23 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/net/url_request_context_getter.h"
-#include "chrome/common/render_messages_params.h"
#include "content/browser/renderer_host/socket_stream_host.h"
#include "content/common/socket_stream.h"
#include "content/common/socket_stream_messages.h"
@@ -151,12 +150,8 @@ void SocketStreamDispatcherHost::DeleteSocketStreamHost(int socket_id) {
net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() {
net::URLRequestContext* rv = NULL;
if (url_request_context_override_.get()) {
- // TODO(jam): temporary code until Gears is taken out, then
- // GetRequestContext will take a different parameter and we can take out
- // this struct and the #include "chrome/common/render_messages_params.h"
- // above.
- ResourceHostMsg_Request request;
- rv = url_request_context_override_->GetRequestContext(request);
+ rv = url_request_context_override_->GetRequestContext(
+ ResourceType::SUB_RESOURCE);
}
if (!rv) {
URLRequestContextGetter* context_getter =
« no previous file with comments | « content/browser/renderer_host/resource_queue_unittest.cc ('k') | content/browser/tab_contents/tab_contents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698