OLD | NEW |
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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 161 |
162 // Extensions may have permission to access chrome:// URLs. | 162 // Extensions may have permission to access chrome:// URLs. |
163 ChildProcessSecurityPolicy::GetInstance()->GrantScheme( | 163 ChildProcessSecurityPolicy::GetInstance()->GrantScheme( |
164 process()->id(), chrome::kChromeUIScheme); | 164 process()->id(), chrome::kChromeUIScheme); |
165 } | 165 } |
166 | 166 |
167 renderer_initialized_ = true; | 167 renderer_initialized_ = true; |
168 | 168 |
169 ViewMsg_New_Params params; | 169 ViewMsg_New_Params params; |
170 params.parent_window = GetNativeViewId(); | 170 params.parent_window = GetNativeViewId(); |
| 171 params.compositing_surface = GetCompositingSurface(); |
171 params.renderer_preferences = | 172 params.renderer_preferences = |
172 delegate_->GetRendererPrefs(process()->profile()); | 173 delegate_->GetRendererPrefs(process()->profile()); |
173 params.web_preferences = delegate_->GetWebkitPrefs(); | 174 params.web_preferences = delegate_->GetWebkitPrefs(); |
174 params.view_id = routing_id(); | 175 params.view_id = routing_id(); |
175 params.session_storage_namespace_id = session_storage_namespace_->id(); | 176 params.session_storage_namespace_id = session_storage_namespace_->id(); |
176 params.frame_name = frame_name; | 177 params.frame_name = frame_name; |
177 Send(new ViewMsg_New(params)); | 178 Send(new ViewMsg_New(params)); |
178 | 179 |
179 // Set the alternate error page, which is profile specific, in the renderer. | 180 // Set the alternate error page, which is profile specific, in the renderer. |
180 GURL url = delegate_->GetAlternateErrorPageURL(); | 181 GURL url = delegate_->GetAlternateErrorPageURL(); |
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1620 LOG(DFATAL) << "Invalid checked state " << checked_state; | 1621 LOG(DFATAL) << "Invalid checked state " << checked_state; |
1621 return; | 1622 return; |
1622 } | 1623 } |
1623 | 1624 |
1624 CommandState state; | 1625 CommandState state; |
1625 state.is_enabled = is_enabled; | 1626 state.is_enabled = is_enabled; |
1626 state.checked_state = | 1627 state.checked_state = |
1627 static_cast<RenderViewCommandCheckedState>(checked_state); | 1628 static_cast<RenderViewCommandCheckedState>(checked_state); |
1628 command_states_[static_cast<RenderViewCommand>(command)] = state; | 1629 command_states_[static_cast<RenderViewCommand>(command)] = state; |
1629 } | 1630 } |
OLD | NEW |