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

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller.cc

Issue 2093573003: Debug shortcut to toggle touch view (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Debug shortcut to toggle touch view Created 4 years, 6 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: ash/wm/maximize_mode/maximize_mode_controller.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
index 2cc2fcf55d6cc32f72dbda4cbd6e1dff9ce283af..4002a5c7fc618d09b115dbb445ee887fa919d87d 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -33,6 +33,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "base/sys_info.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "ui/chromeos/accelerometer/accelerometer_util.h"
#endif // OS_CHROMEOS
@@ -141,6 +142,10 @@ MaximizeModeController::~MaximizeModeController() {
}
bool MaximizeModeController::CanEnterMaximizeMode() {
+#if defined(OS_CHROMEOS)
+ if (!base::SysInfo::IsRunningOnChromeOS())
+ return true;
+#endif
oshima 2016/06/23 23:39:35 tuns out that this isn't necessary. reverted.
// If we have ever seen accelerometer data, then HandleHingeRotation may
// trigger maximize mode at some point in the future.
// The --enable-touch-view-testing switch can also mean that we may enter
« ash/accelerators/accelerator_table.cc ('K') | « ash/accelerators/debug_commands.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698