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 1848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1859 } | 1859 } |
1860 } | 1860 } |
1861 | 1861 |
1862 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 1862 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
1863 DidToggleFullscreenModeForTab( | 1863 DidToggleFullscreenModeForTab( |
1864 IsFullscreenForCurrentTab( | 1864 IsFullscreenForCurrentTab( |
1865 GetRenderViewHost()->GetWidget()), | 1865 GetRenderViewHost()->GetWidget()), |
1866 will_cause_resize)); | 1866 will_cause_resize)); |
1867 } | 1867 } |
1868 | 1868 |
1869 // TODO(alexmos): Remove the unused |render_widget_host| parameter. | |
1870 bool WebContentsImpl::IsFullscreenForCurrentTab( | 1869 bool WebContentsImpl::IsFullscreenForCurrentTab( |
1871 RenderWidgetHostImpl* render_widget_host) const { | 1870 RenderWidgetHostImpl* render_widget_host) const { |
| 1871 if (!RenderViewHostImpl::From(render_widget_host)) |
| 1872 return false; |
| 1873 |
1872 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; | 1874 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; |
1873 } | 1875 } |
1874 | 1876 |
1875 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( | 1877 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( |
1876 RenderWidgetHostImpl* render_widget_host) const { | 1878 RenderWidgetHostImpl* render_widget_host) const { |
1877 if (!RenderViewHostImpl::From(render_widget_host)) | 1879 if (!RenderViewHostImpl::From(render_widget_host)) |
1878 return blink::WebDisplayModeBrowser; | 1880 return blink::WebDisplayModeBrowser; |
1879 | 1881 |
1880 return delegate_ ? delegate_->GetDisplayMode(this) | 1882 return delegate_ ? delegate_->GetDisplayMode(this) |
1881 : blink::WebDisplayModeBrowser; | 1883 : blink::WebDisplayModeBrowser; |
(...skipping 3153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5035 for (RenderViewHost* render_view_host : render_view_host_set) | 5037 for (RenderViewHost* render_view_host : render_view_host_set) |
5036 render_view_host->OnWebkitPreferencesChanged(); | 5038 render_view_host->OnWebkitPreferencesChanged(); |
5037 } | 5039 } |
5038 | 5040 |
5039 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 5041 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
5040 JavaScriptDialogManager* dialog_manager) { | 5042 JavaScriptDialogManager* dialog_manager) { |
5041 dialog_manager_ = dialog_manager; | 5043 dialog_manager_ = dialog_manager; |
5042 } | 5044 } |
5043 | 5045 |
5044 } // namespace content | 5046 } // namespace content |
OLD | NEW |