| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3087 | 3087 |
| 3088 // Now that the RenderView has been created, we need to tell it its size. | 3088 // Now that the RenderView has been created, we need to tell it its size. |
| 3089 if (rwh_view) | 3089 if (rwh_view) |
| 3090 rwh_view->SetSize(view_->GetContainerSize()); | 3090 rwh_view->SetSize(view_->GetContainerSize()); |
| 3091 | 3091 |
| 3092 // Make sure we use the correct starting page_id in the new RenderView. | 3092 // Make sure we use the correct starting page_id in the new RenderView. |
| 3093 UpdateMaxPageIDIfNecessary(render_view_host); | 3093 UpdateMaxPageIDIfNecessary(render_view_host); |
| 3094 int32 max_page_id = | 3094 int32 max_page_id = |
| 3095 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); | 3095 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); |
| 3096 | 3096 |
| 3097 content::NotificationService::current()->Notify( |
| 3098 content::NOTIFICATION_WEB_CONTENTS_WILL_CREATE_RENDER_VIEW, |
| 3099 content::Source<WebContents>(this), |
| 3100 content::Details<RenderViewHost>(render_view_host)); |
| 3101 |
| 3097 std::string embedder_channel_name; | 3102 std::string embedder_channel_name; |
| 3098 int embedder_container_id; | 3103 int embedder_container_id; |
| 3099 GetBrowserPluginEmbedderInfo(render_view_host, | 3104 GetBrowserPluginEmbedderInfo(render_view_host, |
| 3100 &embedder_channel_name, | 3105 &embedder_channel_name, |
| 3101 &embedder_container_id); | 3106 &embedder_container_id); |
| 3102 if (!static_cast<RenderViewHostImpl*>( | 3107 if (!static_cast<RenderViewHostImpl*>( |
| 3103 render_view_host)->CreateRenderView(string16(), | 3108 render_view_host)->CreateRenderView(string16(), |
| 3104 opener_route_id, | 3109 opener_route_id, |
| 3105 max_page_id, | 3110 max_page_id, |
| 3106 embedder_channel_name, | 3111 embedder_channel_name, |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3186 old_browser_plugin_host()->embedder_render_process_host(); | 3191 old_browser_plugin_host()->embedder_render_process_host(); |
| 3187 *embedder_container_id = old_browser_plugin_host()->instance_id(); | 3192 *embedder_container_id = old_browser_plugin_host()->instance_id(); |
| 3188 int embedder_process_id = | 3193 int embedder_process_id = |
| 3189 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; | 3194 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; |
| 3190 if (embedder_process_id != -1) { | 3195 if (embedder_process_id != -1) { |
| 3191 *embedder_channel_name = | 3196 *embedder_channel_name = |
| 3192 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), | 3197 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), |
| 3193 embedder_process_id); | 3198 embedder_process_id); |
| 3194 } | 3199 } |
| 3195 } | 3200 } |
| OLD | NEW |