Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(358)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1914643005: Add support for entering/exiting HTML fullscreen from OOPIFs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Daniel's comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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.
1869 bool WebContentsImpl::IsFullscreenForCurrentTab( 1870 bool WebContentsImpl::IsFullscreenForCurrentTab(
1870 RenderWidgetHostImpl* render_widget_host) const { 1871 RenderWidgetHostImpl* render_widget_host) const {
1871 if (!RenderViewHostImpl::From(render_widget_host))
1872 return false;
1873
1874 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; 1872 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false;
1875 } 1873 }
1876 1874
1877 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( 1875 blink::WebDisplayMode WebContentsImpl::GetDisplayMode(
1878 RenderWidgetHostImpl* render_widget_host) const { 1876 RenderWidgetHostImpl* render_widget_host) const {
1879 if (!RenderViewHostImpl::From(render_widget_host)) 1877 if (!RenderViewHostImpl::From(render_widget_host))
1880 return blink::WebDisplayModeBrowser; 1878 return blink::WebDisplayModeBrowser;
1881 1879
1882 return delegate_ ? delegate_->GetDisplayMode(this) 1880 return delegate_ ? delegate_->GetDisplayMode(this)
1883 : blink::WebDisplayModeBrowser; 1881 : blink::WebDisplayModeBrowser;
(...skipping 3153 matching lines...) Expand 10 before | Expand all | Expand 10 after
5037 for (RenderViewHost* render_view_host : render_view_host_set) 5035 for (RenderViewHost* render_view_host : render_view_host_set)
5038 render_view_host->OnWebkitPreferencesChanged(); 5036 render_view_host->OnWebkitPreferencesChanged();
5039 } 5037 }
5040 5038
5041 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5039 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5042 JavaScriptDialogManager* dialog_manager) { 5040 JavaScriptDialogManager* dialog_manager) {
5043 dialog_manager_ = dialog_manager; 5041 dialog_manager_ = dialog_manager;
5044 } 5042 }
5045 5043
5046 } // namespace content 5044 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698