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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 14366004: cros: Turn immersive fullscreen on by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_chromeos test expectation Created 7 years, 8 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
« no previous file with comments | « chrome/browser/ui/ash/DEPS ('k') | chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 1fd4f9a730939d58e589f4e6063005984ca858f6..9384f1613d57a6ecda81d5db348c780879e58998 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/time_format.h"
@@ -62,17 +63,6 @@ ChromeShellDelegate::~ChromeShellDelegate() {
instance_ = NULL;
}
-// static
-bool ChromeShellDelegate::UseImmersiveFullscreen() {
-#if defined(OS_CHROMEOS)
- // Kiosk mode needs the whole screen.
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- return !command_line->HasSwitch(switches::kKioskMode) &&
- command_line->HasSwitch(ash::switches::kAshImmersiveFullscreen);
-#endif
- return false;
-}
-
bool ChromeShellDelegate::IsMultiProfilesEnabled() const {
return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
}
@@ -110,7 +100,7 @@ void ChromeShellDelegate::ToggleMaximized() {
// TODO(jamescook): If immersive mode replaces fullscreen, rename this
// function and the interface to ToggleFullscreen.
- if (UseImmersiveFullscreen()) {
+ if (chrome::UseImmersiveFullscreen()) {
chrome::ToggleFullscreenMode(GetTargetBrowser());
return;
}
« no previous file with comments | « chrome/browser/ui/ash/DEPS ('k') | chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698