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

Unified Diff: chrome/browser/ui/immersive_fullscreen_configuration.cc

Issue 16070003: Move immersive fullscreen check into ImmersiveFullscreenConfiguration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rm DEPS file Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/immersive_fullscreen_configuration.cc
diff --git a/chrome/browser/ui/immersive_fullscreen_configuration.cc b/chrome/browser/ui/immersive_fullscreen_configuration.cc
index 7905978b38c7dff455644bbb7283cf611e0b67b4..54b06cc969fd1e71401adab22afef172bb8630e5 100644
--- a/chrome/browser/ui/immersive_fullscreen_configuration.cc
+++ b/chrome/browser/ui/immersive_fullscreen_configuration.cc
@@ -4,6 +4,26 @@
#include "chrome/browser/ui/immersive_fullscreen_configuration.h"
+#if defined(OS_CHROMEOS)
+#include "ash/ash_switches.h"
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#endif // defined(OS_CHROMEOS)
+
+bool ImmersiveFullscreenConfiguration::UseImmersiveFullscreen() {
+#if defined(OS_CHROMEOS)
+ CommandLine* command = CommandLine::ForCurrentProcess();
+ // Kiosk mode needs the whole screen.
+ if (command->HasSwitch(switches::kKioskMode))
+ return false;
+ // Immersive fullscreen is on by default. If you change the default you must
+ // change the enable function below and BrowserTest FullscreenBookmarkBar
James Cook 2013/05/27 12:00:20 c/b/ui/browser_browsertest.cc should be able to ca
tfarina 2013/05/29 02:03:52 I'll look into this next.
+ // (which cannot depend on this function due to DEPS).
+ return !command->HasSwitch(ash::switches::kAshDisableImmersiveFullscreen);
+#endif
+ return false;
+}
+
int ImmersiveFullscreenConfiguration::immersive_mode_reveal_delay_ms_ = 200;
int
ImmersiveFullscreenConfiguration::immersive_mode_reveal_x_threshold_pixels_ = 3;

Powered by Google App Engine
This is Rietveld 408576698