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

Unified Diff: content/shell/browser/shell.cc

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years 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
« no previous file with comments | « content/shell/browser/shell.h ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 7d8ac38b6fa412982bba407b0f90db131f9f5356..ab9603ff68d11d7ddd484e4d24676c765c8d7939 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -306,7 +306,7 @@ void Shell::ExitFullscreenModeForTab(WebContents* web_contents) {
void Shell::ToggleFullscreenModeForTab(WebContents* web_contents,
bool enter_fullscreen) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
PlatformToggleFullscreenModeForTab(web_contents, enter_fullscreen);
#endif
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -319,7 +319,7 @@ void Shell::ToggleFullscreenModeForTab(WebContents* web_contents,
}
bool Shell::IsFullscreenForTabOrPending(const WebContents* web_contents) const {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
return PlatformIsFullscreenForTabOrPending(web_contents);
#else
return is_fullscreen_;
« no previous file with comments | « content/shell/browser/shell.h ('k') | content/shell/browser/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698