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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <cmath> | 9 #include <cmath> |
10 #include <utility> | 10 #include <utility> |
(...skipping 1855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1866 } | 1866 } |
1867 } | 1867 } |
1868 | 1868 |
1869 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 1869 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
1870 DidToggleFullscreenModeForTab( | 1870 DidToggleFullscreenModeForTab( |
1871 IsFullscreenForCurrentTab( | 1871 IsFullscreenForCurrentTab( |
1872 GetRenderViewHost()->GetWidget()), | 1872 GetRenderViewHost()->GetWidget()), |
1873 will_cause_resize)); | 1873 will_cause_resize)); |
1874 } | 1874 } |
1875 | 1875 |
| 1876 // TODO(alexmos): Remove the unused |render_widget_host| parameter. |
1876 bool WebContentsImpl::IsFullscreenForCurrentTab( | 1877 bool WebContentsImpl::IsFullscreenForCurrentTab( |
1877 RenderWidgetHostImpl* render_widget_host) const { | 1878 RenderWidgetHostImpl* render_widget_host) const { |
1878 if (!RenderViewHostImpl::From(render_widget_host)) | |
1879 return false; | |
1880 | |
1881 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; | 1879 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; |
1882 } | 1880 } |
1883 | 1881 |
1884 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( | 1882 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( |
1885 RenderWidgetHostImpl* render_widget_host) const { | 1883 RenderWidgetHostImpl* render_widget_host) const { |
1886 if (!RenderViewHostImpl::From(render_widget_host)) | 1884 if (!RenderViewHostImpl::From(render_widget_host)) |
1887 return blink::WebDisplayModeBrowser; | 1885 return blink::WebDisplayModeBrowser; |
1888 | 1886 |
1889 return delegate_ ? delegate_->GetDisplayMode(this) | 1887 return delegate_ ? delegate_->GetDisplayMode(this) |
1890 : blink::WebDisplayModeBrowser; | 1888 : blink::WebDisplayModeBrowser; |
(...skipping 3170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5061 for (RenderViewHost* render_view_host : render_view_host_set) | 5059 for (RenderViewHost* render_view_host : render_view_host_set) |
5062 render_view_host->OnWebkitPreferencesChanged(); | 5060 render_view_host->OnWebkitPreferencesChanged(); |
5063 } | 5061 } |
5064 | 5062 |
5065 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 5063 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
5066 JavaScriptDialogManager* dialog_manager) { | 5064 JavaScriptDialogManager* dialog_manager) { |
5067 dialog_manager_ = dialog_manager; | 5065 dialog_manager_ = dialog_manager; |
5068 } | 5066 } |
5069 | 5067 |
5070 } // namespace content | 5068 } // namespace content |
OLD | NEW |