| 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/tab_contents/tab_contents_view.h" | 5 #include "content/browser/tab_contents/tab_contents_view.h" |
| 6 | 6 |
| 7 #include "content/browser/renderer_host/render_process_host.h" | 7 #include "content/browser/renderer_host/render_process_host.h" |
| 8 #include "content/browser/renderer_host/render_view_host.h" | 8 #include "content/browser/renderer_host/render_view_host.h" |
| 9 #include "content/browser/renderer_host/render_view_host_delegate.h" | 9 #include "content/browser/renderer_host/render_view_host_delegate.h" |
| 10 #include "content/browser/renderer_host/render_widget_host.h" | 10 #include "content/browser/renderer_host/render_widget_host.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 void TabContentsView::CreateNewFullscreenWidget(int route_id) { | 61 void TabContentsView::CreateNewFullscreenWidget(int route_id) { |
| 62 CreateNewFullscreenWidgetInternal(route_id); | 62 CreateNewFullscreenWidgetInternal(route_id); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void TabContentsView::ShowCreatedWindow(int route_id, | 65 void TabContentsView::ShowCreatedWindow(int route_id, |
| 66 WindowOpenDisposition disposition, | 66 WindowOpenDisposition disposition, |
| 67 const gfx::Rect& initial_pos, | 67 const gfx::Rect& initial_pos, |
| 68 bool user_gesture) { | 68 bool user_gesture) { |
| 69 TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id); | 69 TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id); |
| 70 if (contents) { | 70 if (contents) { |
| 71 tab_contents()->AddOrBlockNewContents( | 71 tab_contents()->AddNewContents( |
| 72 contents, disposition, initial_pos, user_gesture); | 72 contents, disposition, initial_pos, user_gesture); |
| 73 } | 73 } |
| 74 } | 74 } |
| 75 | 75 |
| 76 void TabContentsView::ShowCreatedWidget(int route_id, | 76 void TabContentsView::ShowCreatedWidget(int route_id, |
| 77 const gfx::Rect& initial_pos) { | 77 const gfx::Rect& initial_pos) { |
| 78 RenderWidgetHostView* widget_host_view = | 78 RenderWidgetHostView* widget_host_view = |
| 79 delegate_view_helper_.GetCreatedWidget(route_id); | 79 delegate_view_helper_.GetCreatedWidget(route_id); |
| 80 ShowCreatedWidgetInternal(widget_host_view, initial_pos); | 80 ShowCreatedWidgetInternal(widget_host_view, initial_pos); |
| 81 } | 81 } |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 } | 159 } |
| 160 | 160 |
| 161 void TabContentsView::ShowCreatedFullscreenWidgetInternal( | 161 void TabContentsView::ShowCreatedFullscreenWidgetInternal( |
| 162 RenderWidgetHostView* widget_host_view) { | 162 RenderWidgetHostView* widget_host_view) { |
| 163 if (tab_contents_->delegate()) | 163 if (tab_contents_->delegate()) |
| 164 tab_contents_->delegate()->RenderWidgetShowing(); | 164 tab_contents_->delegate()->RenderWidgetShowing(); |
| 165 | 165 |
| 166 widget_host_view->InitAsFullscreen(); | 166 widget_host_view->InitAsFullscreen(); |
| 167 widget_host_view->GetRenderWidgetHost()->Init(); | 167 widget_host_view->GetRenderWidgetHost()->Init(); |
| 168 } | 168 } |
| OLD | NEW |