| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152         process()->id()); | 152         process()->id()); | 
| 153   } | 153   } | 
| 154 | 154 | 
| 155   if (BindingsPolicy::is_extension_enabled(enabled_bindings_)) { | 155   if (BindingsPolicy::is_extension_enabled(enabled_bindings_)) { | 
| 156     ChildProcessSecurityPolicy::GetInstance()->GrantExtensionBindings( | 156     ChildProcessSecurityPolicy::GetInstance()->GrantExtensionBindings( | 
| 157         process()->id()); | 157         process()->id()); | 
| 158   } | 158   } | 
| 159 | 159 | 
| 160   renderer_initialized_ = true; | 160   renderer_initialized_ = true; | 
| 161 | 161 | 
|  | 162   process()->SetCompositingSurface(routing_id(), | 
|  | 163                                    GetCompositingSurface()); | 
|  | 164 | 
| 162   ViewMsg_New_Params params; | 165   ViewMsg_New_Params params; | 
| 163   params.parent_window = GetNativeViewId(); | 166   params.parent_window = GetNativeViewId(); | 
| 164   params.compositing_surface = GetCompositingSurface(); |  | 
| 165   params.renderer_preferences = | 167   params.renderer_preferences = | 
| 166       delegate_->GetRendererPrefs(process()->profile()); | 168       delegate_->GetRendererPrefs(process()->profile()); | 
| 167   params.web_preferences = delegate_->GetWebkitPrefs(); | 169   params.web_preferences = delegate_->GetWebkitPrefs(); | 
| 168   params.view_id = routing_id(); | 170   params.view_id = routing_id(); | 
| 169   params.session_storage_namespace_id = session_storage_namespace_->id(); | 171   params.session_storage_namespace_id = session_storage_namespace_->id(); | 
| 170   params.frame_name = frame_name; | 172   params.frame_name = frame_name; | 
| 171   Send(new ViewMsg_New(params)); | 173   Send(new ViewMsg_New(params)); | 
| 172 | 174 | 
| 173   // If it's enabled, tell the renderer to set up the Javascript bindings for | 175   // If it's enabled, tell the renderer to set up the Javascript bindings for | 
| 174   // sending messages back to the browser. | 176   // sending messages back to the browser. | 
| (...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1312   if (view) { | 1314   if (view) { | 
| 1313     view->ShowPopupMenu(params.bounds, | 1315     view->ShowPopupMenu(params.bounds, | 
| 1314                         params.item_height, | 1316                         params.item_height, | 
| 1315                         params.item_font_size, | 1317                         params.item_font_size, | 
| 1316                         params.selected_item, | 1318                         params.selected_item, | 
| 1317                         params.popup_items, | 1319                         params.popup_items, | 
| 1318                         params.right_aligned); | 1320                         params.right_aligned); | 
| 1319   } | 1321   } | 
| 1320 } | 1322 } | 
| 1321 #endif | 1323 #endif | 
| OLD | NEW | 
|---|