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

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: Rebase 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
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 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
1858 1858
1859 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 1859 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
1860 DidToggleFullscreenModeForTab( 1860 DidToggleFullscreenModeForTab(
1861 IsFullscreenForCurrentTab( 1861 IsFullscreenForCurrentTab(
1862 GetRenderViewHost()->GetWidget()), 1862 GetRenderViewHost()->GetWidget()),
1863 will_cause_resize)); 1863 will_cause_resize));
1864 } 1864 }
1865 1865
1866 bool WebContentsImpl::IsFullscreenForCurrentTab( 1866 bool WebContentsImpl::IsFullscreenForCurrentTab(
1867 RenderWidgetHostImpl* render_widget_host) const { 1867 RenderWidgetHostImpl* render_widget_host) const {
1868 if (!RenderViewHostImpl::From(render_widget_host))
alexmos 2016/05/10 21:36:24 Removing this allows subframe widgets to pick up t
Charlie Reis 2016/05/12 22:59:23 Ok. Let's put a TODO to remove it.
1869 return false;
1870
1871 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false; 1868 return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false;
1872 } 1869 }
1873 1870
1874 blink::WebDisplayMode WebContentsImpl::GetDisplayMode( 1871 blink::WebDisplayMode WebContentsImpl::GetDisplayMode(
1875 RenderWidgetHostImpl* render_widget_host) const { 1872 RenderWidgetHostImpl* render_widget_host) const {
1876 if (!RenderViewHostImpl::From(render_widget_host)) 1873 if (!RenderViewHostImpl::From(render_widget_host))
1877 return blink::WebDisplayModeBrowser; 1874 return blink::WebDisplayModeBrowser;
1878 1875
1879 return delegate_ ? delegate_->GetDisplayMode(this) 1876 return delegate_ ? delegate_->GetDisplayMode(this)
1880 : blink::WebDisplayModeBrowser; 1877 : blink::WebDisplayModeBrowser;
(...skipping 3151 matching lines...) Expand 10 before | Expand all | Expand 10 after
5032 for (RenderViewHost* render_view_host : render_view_host_set) 5029 for (RenderViewHost* render_view_host : render_view_host_set)
5033 render_view_host->OnWebkitPreferencesChanged(); 5030 render_view_host->OnWebkitPreferencesChanged();
5034 } 5031 }
5035 5032
5036 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( 5033 void WebContentsImpl::SetJavaScriptDialogManagerForTesting(
5037 JavaScriptDialogManager* dialog_manager) { 5034 JavaScriptDialogManager* dialog_manager) {
5038 dialog_manager_ = dialog_manager; 5035 dialog_manager_ = dialog_manager;
5039 } 5036 }
5040 5037
5041 } // namespace content 5038 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698