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

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

Issue 6840060: Progress towards fixing 77536 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/renderer_host/render_view_host.h" 5 #include "content/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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 160
161 // Extensions may have permission to access chrome:// URLs. 161 // Extensions may have permission to access chrome:// URLs.
162 ChildProcessSecurityPolicy::GetInstance()->GrantScheme( 162 ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
163 process()->id(), chrome::kChromeUIScheme); 163 process()->id(), chrome::kChromeUIScheme);
164 } 164 }
165 165
166 renderer_initialized_ = true; 166 renderer_initialized_ = true;
167 167
168 ViewMsg_New_Params params; 168 ViewMsg_New_Params params;
169 params.parent_window = GetNativeViewId(); 169 params.parent_window = GetNativeViewId();
170 params.compositing_surface = GetCompositingSurface();
170 params.renderer_preferences = 171 params.renderer_preferences =
171 delegate_->GetRendererPrefs(process()->profile()); 172 delegate_->GetRendererPrefs(process()->profile());
172 params.web_preferences = delegate_->GetWebkitPrefs(); 173 params.web_preferences = delegate_->GetWebkitPrefs();
173 params.view_id = routing_id(); 174 params.view_id = routing_id();
174 params.session_storage_namespace_id = session_storage_namespace_->id(); 175 params.session_storage_namespace_id = session_storage_namespace_->id();
175 params.frame_name = frame_name; 176 params.frame_name = frame_name;
176 Send(new ViewMsg_New(params)); 177 Send(new ViewMsg_New(params));
177 178
178 // Set the alternate error page, which is profile specific, in the renderer. 179 // Set the alternate error page, which is profile specific, in the renderer.
179 GURL url = delegate_->GetAlternateErrorPageURL(); 180 GURL url = delegate_->GetAlternateErrorPageURL();
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 LOG(DFATAL) << "Invalid checked state " << checked_state; 1620 LOG(DFATAL) << "Invalid checked state " << checked_state;
1620 return; 1621 return;
1621 } 1622 }
1622 1623
1623 CommandState state; 1624 CommandState state;
1624 state.is_enabled = is_enabled; 1625 state.is_enabled = is_enabled;
1625 state.checked_state = 1626 state.checked_state =
1626 static_cast<RenderViewCommandCheckedState>(checked_state); 1627 static_cast<RenderViewCommandCheckedState>(checked_state);
1627 command_states_[static_cast<RenderViewCommand>(command)] = state; 1628 command_states_[static_cast<RenderViewCommand>(command)] = state;
1628 } 1629 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698