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/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 3749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3760 int32 max_page_id = | 3760 int32 max_page_id = |
3761 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); | 3761 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); |
3762 | 3762 |
3763 if (!static_cast<RenderViewHostImpl*>( | 3763 if (!static_cast<RenderViewHostImpl*>( |
3764 render_view_host)->CreateRenderView(string16(), | 3764 render_view_host)->CreateRenderView(string16(), |
3765 opener_route_id, | 3765 opener_route_id, |
3766 max_page_id)) { | 3766 max_page_id)) { |
3767 return false; | 3767 return false; |
3768 } | 3768 } |
3769 | 3769 |
3770 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 3770 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
3771 // Force a ViewMsg_Resize to be sent, needed to make plugins show up on | 3771 // Force a ViewMsg_Resize to be sent, needed to make plugins show up on |
3772 // linux. See crbug.com/83941. | 3772 // linux. See crbug.com/83941. |
3773 if (rwh_view) { | 3773 if (rwh_view) { |
3774 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost()) | 3774 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost()) |
3775 render_widget_host->WasResized(); | 3775 render_widget_host->WasResized(); |
3776 } | 3776 } |
3777 #endif | 3777 #endif |
3778 | 3778 |
3779 return true; | 3779 return true; |
3780 } | 3780 } |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3860 gfx::Size WebContentsImpl::GetSizeForNewRenderView() const { | 3860 gfx::Size WebContentsImpl::GetSizeForNewRenderView() const { |
3861 gfx::Size size; | 3861 gfx::Size size; |
3862 if (delegate_) | 3862 if (delegate_) |
3863 size = delegate_->GetSizeForNewRenderView(this); | 3863 size = delegate_->GetSizeForNewRenderView(this); |
3864 if (size.IsEmpty()) | 3864 if (size.IsEmpty()) |
3865 size = view_->GetContainerSize(); | 3865 size = view_->GetContainerSize(); |
3866 return size; | 3866 return size; |
3867 } | 3867 } |
3868 | 3868 |
3869 } // namespace content | 3869 } // namespace content |
OLD | NEW |