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

Unified Diff: chrome/browser/ui/exclusive_access/fullscreen_controller.cc

Issue 1461463002: Reland fix for thumbnail generation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rework IsFullscreenForTabOrPending() (per mia@). Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/exclusive_access/fullscreen_controller.cc
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index 9f18156b6f09cca7b8ef2857e9901875a6db8cd8..8f058d2b22bd7930769e1fe47ce62cb2dfab368b 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -93,13 +93,14 @@ bool FullscreenController::IsUserAcceptedFullscreen() const {
bool FullscreenController::IsFullscreenForTabOrPending(
const WebContents* web_contents) const {
+ if (IsFullscreenForCapturedTab(web_contents))
+ return true;
if (web_contents == exclusive_access_tab()) {
DCHECK(web_contents ==
exclusive_access_manager()->context()->GetActiveWebContents());
- DCHECK(web_contents->GetCapturerCount() == 0);
return true;
}
- return IsFullscreenForCapturedTab(web_contents);
+ return false;
}
bool FullscreenController::IsFullscreenCausedByTab() const {
« no previous file with comments | « chrome/browser/thumbnails/thumbnail_tab_helper.cc ('k') | content/browser/compositor/delegated_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698