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

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

Issue 3036038: ChromeFrame currently overrides the request context for intercepting network ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // Be sure to clean up any leftover state from cross-site requests. 139 // Be sure to clean up any leftover state from cross-site requests.
140 Singleton<CrossSiteRequestManager>()->SetHasPendingCrossSiteRequest( 140 Singleton<CrossSiteRequestManager>()->SetHasPendingCrossSiteRequest(
141 process()->id(), routing_id(), false); 141 process()->id(), routing_id(), false);
142 142
143 NotificationService::current()->Notify( 143 NotificationService::current()->Notify(
144 NotificationType::EXTENSION_PORT_DELETED_DEBUG, 144 NotificationType::EXTENSION_PORT_DELETED_DEBUG,
145 Source<IPC::Message::Sender>(this), 145 Source<IPC::Message::Sender>(this),
146 NotificationService::NoDetails()); 146 NotificationService::NoDetails());
147 } 147 }
148 148
149 bool RenderViewHost::CreateRenderView( 149 bool RenderViewHost::CreateRenderView(const string16& frame_name) {
150 URLRequestContextGetter* request_context, const string16& frame_name) {
151 DCHECK(!IsRenderViewLive()) << "Creating view twice"; 150 DCHECK(!IsRenderViewLive()) << "Creating view twice";
152 151
153 // The process may (if we're sharing a process with another host that already 152 // The process may (if we're sharing a process with another host that already
154 // initialized it) or may not (we have our own process or the old process 153 // initialized it) or may not (we have our own process or the old process
155 // crashed) have been initialized. Calling Init multiple times will be 154 // crashed) have been initialized. Calling Init multiple times will be
156 // ignored, so this is safe. 155 // ignored, so this is safe.
157 if (!process()->Init(is_extension_process_, request_context)) 156 if (!process()->Init(is_extension_process_))
158 return false; 157 return false;
159 DCHECK(process()->HasConnection()); 158 DCHECK(process()->HasConnection());
160 DCHECK(process()->profile()); 159 DCHECK(process()->profile());
161 160
162 if (BindingsPolicy::is_dom_ui_enabled(enabled_bindings_)) { 161 if (BindingsPolicy::is_dom_ui_enabled(enabled_bindings_)) {
163 ChildProcessSecurityPolicy::GetInstance()->GrantDOMUIBindings( 162 ChildProcessSecurityPolicy::GetInstance()->GrantDOMUIBindings(
164 process()->id()); 163 process()->id());
165 } 164 }
166 165
167 if (BindingsPolicy::is_extension_enabled(enabled_bindings_)) { 166 if (BindingsPolicy::is_extension_enabled(enabled_bindings_)) {
(...skipping 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 RenderViewHostDelegate::ContentSettings* content_settings_delegate = 1976 RenderViewHostDelegate::ContentSettings* content_settings_delegate =
1978 delegate_->GetContentSettingsDelegate(); 1977 delegate_->GetContentSettingsDelegate();
1979 if (content_settings_delegate) 1978 if (content_settings_delegate)
1980 content_settings_delegate->OnWebDatabaseAccessed( 1979 content_settings_delegate->OnWebDatabaseAccessed(
1981 url, name, display_name, estimated_size, blocked_by_policy); 1980 url, name, display_name, estimated_size, blocked_by_policy);
1982 } 1981 }
1983 1982
1984 void RenderViewHost::OnSetDisplayingPDFContent() { 1983 void RenderViewHost::OnSetDisplayingPDFContent() {
1985 delegate_->SetDisplayingPDFContent(); 1984 delegate_->SetDisplayingPDFContent();
1986 } 1985 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698