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 |