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 3617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3628 int32 max_page_id = | 3628 int32 max_page_id = |
3629 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); | 3629 GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance()); |
3630 | 3630 |
3631 if (!static_cast<RenderViewHostImpl*>( | 3631 if (!static_cast<RenderViewHostImpl*>( |
3632 render_view_host)->CreateRenderView(string16(), | 3632 render_view_host)->CreateRenderView(string16(), |
3633 opener_route_id, | 3633 opener_route_id, |
3634 max_page_id)) { | 3634 max_page_id)) { |
3635 return false; | 3635 return false; |
3636 } | 3636 } |
3637 | 3637 |
3638 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 3638 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
| 3639 !defined(OS_NACL) |
3639 // Force a ViewMsg_Resize to be sent, needed to make plugins show up on | 3640 // Force a ViewMsg_Resize to be sent, needed to make plugins show up on |
3640 // linux. See crbug.com/83941. | 3641 // linux. See crbug.com/83941. |
3641 if (rwh_view) { | 3642 if (rwh_view) { |
3642 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost()) | 3643 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost()) |
3643 render_widget_host->WasResized(); | 3644 render_widget_host->WasResized(); |
3644 } | 3645 } |
3645 #endif | 3646 #endif |
3646 | 3647 |
3647 return true; | 3648 return true; |
3648 } | 3649 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3708 } | 3709 } |
3709 | 3710 |
3710 void WebContentsImpl::ClearAllPowerSaveBlockers() { | 3711 void WebContentsImpl::ClearAllPowerSaveBlockers() { |
3711 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); | 3712 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); |
3712 i != power_save_blockers_.end(); ++i) | 3713 i != power_save_blockers_.end(); ++i) |
3713 STLDeleteValues(&power_save_blockers_[i->first]); | 3714 STLDeleteValues(&power_save_blockers_[i->first]); |
3714 power_save_blockers_.clear(); | 3715 power_save_blockers_.clear(); |
3715 } | 3716 } |
3716 | 3717 |
3717 } // namespace content | 3718 } // namespace content |
OLD | NEW |