| OLD | NEW |
| 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 webkit_prefs.databases_enabled = true; | 184 webkit_prefs.databases_enabled = true; |
| 185 } | 185 } |
| 186 | 186 |
| 187 ViewMsg_New_Params params; | 187 ViewMsg_New_Params params; |
| 188 params.parent_window = GetNativeViewId(); | 188 params.parent_window = GetNativeViewId(); |
| 189 params.renderer_preferences = | 189 params.renderer_preferences = |
| 190 delegate_->GetRendererPrefs(process()->profile()); | 190 delegate_->GetRendererPrefs(process()->profile()); |
| 191 params.web_preferences = webkit_prefs; | 191 params.web_preferences = webkit_prefs; |
| 192 params.view_id = routing_id(); | 192 params.view_id = routing_id(); |
| 193 params.session_storage_namespace_id = session_storage_namespace_id_; | 193 params.session_storage_namespace_id = session_storage_namespace_id_; |
| 194 params.frame_name = delegate_->GetRenderViewFrameName(); |
| 194 Send(new ViewMsg_New(params)); | 195 Send(new ViewMsg_New(params)); |
| 195 | 196 |
| 196 // Set the alternate error page, which is profile specific, in the renderer. | 197 // Set the alternate error page, which is profile specific, in the renderer. |
| 197 GURL url = delegate_->GetAlternateErrorPageURL(); | 198 GURL url = delegate_->GetAlternateErrorPageURL(); |
| 198 SetAlternateErrorPageURL(url); | 199 SetAlternateErrorPageURL(url); |
| 199 | 200 |
| 200 // If it's enabled, tell the renderer to set up the Javascript bindings for | 201 // If it's enabled, tell the renderer to set up the Javascript bindings for |
| 201 // sending messages back to the browser. | 202 // sending messages back to the browser. |
| 202 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_)); | 203 Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_)); |
| 203 UpdateBrowserWindowId(delegate_->GetBrowserWindowID()); | 204 UpdateBrowserWindowId(delegate_->GetBrowserWindowID()); |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 | 855 |
| 855 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); | 856 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
| 856 if (devtools_manager) // NULL in tests | 857 if (devtools_manager) // NULL in tests |
| 857 devtools_manager->UnregisterDevToolsClientHostFor(this); | 858 devtools_manager->UnregisterDevToolsClientHostFor(this); |
| 858 | 859 |
| 859 RenderWidgetHost::Shutdown(); | 860 RenderWidgetHost::Shutdown(); |
| 860 } | 861 } |
| 861 | 862 |
| 862 void RenderViewHost::CreateNewWindow( | 863 void RenderViewHost::CreateNewWindow( |
| 863 int route_id, | 864 int route_id, |
| 864 WindowContainerType window_container_type) { | 865 WindowContainerType window_container_type, |
| 866 const string16& frame_name) { |
| 865 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 867 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
| 866 if (!view) | 868 if (!view) |
| 867 return; | 869 return; |
| 868 | 870 |
| 869 view->CreateNewWindow(route_id, window_container_type); | 871 view->CreateNewWindow(route_id, window_container_type, frame_name); |
| 870 } | 872 } |
| 871 | 873 |
| 872 void RenderViewHost::CreateNewWidget(int route_id, | 874 void RenderViewHost::CreateNewWidget(int route_id, |
| 873 WebKit::WebPopupType popup_type) { | 875 WebKit::WebPopupType popup_type) { |
| 874 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); | 876 RenderViewHostDelegate::View* view = delegate_->GetViewDelegate(); |
| 875 if (view) | 877 if (view) |
| 876 view->CreateNewWidget(route_id, popup_type); | 878 view->CreateNewWidget(route_id, popup_type); |
| 877 } | 879 } |
| 878 | 880 |
| 879 void RenderViewHost::OnMsgShowView(int route_id, | 881 void RenderViewHost::OnMsgShowView(int route_id, |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1889 integration_delegate->OnPageTranslated(page_id, original_lang, | 1891 integration_delegate->OnPageTranslated(page_id, original_lang, |
| 1890 translated_lang, error_type); | 1892 translated_lang, error_type); |
| 1891 } | 1893 } |
| 1892 | 1894 |
| 1893 void RenderViewHost::OnContentBlocked(ContentSettingsType type) { | 1895 void RenderViewHost::OnContentBlocked(ContentSettingsType type) { |
| 1894 RenderViewHostDelegate::Resource* resource_delegate = | 1896 RenderViewHostDelegate::Resource* resource_delegate = |
| 1895 delegate_->GetResourceDelegate(); | 1897 delegate_->GetResourceDelegate(); |
| 1896 if (resource_delegate) | 1898 if (resource_delegate) |
| 1897 resource_delegate->OnContentBlocked(type); | 1899 resource_delegate->OnContentBlocked(type); |
| 1898 } | 1900 } |
| OLD | NEW |