Do not enter Maximize Mode while docked

ash/common/wm/maximize_mode/maximize_mode_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 
 #include <utility>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
@@ skipping 208 matching lines @@
   if (open)
     last_lid_open_time_ = time;
   lid_is_closed_ = !open;
   LeaveMaximizeMode();
 }
 
 void MaximizeModeController::TabletModeEventReceived(
     bool on,
     const base::TimeTicks& time) {
   tablet_mode_switch_is_on_ = on;
+  // Do not change if docked.
+  if (!display::Display::HasInternalDisplay())
+    return;
+  if (!WmShell::Get()->IsActiveDisplayId(
+          display::Display::InternalDisplayId())) {
+    return;

[oshima, 2017/01/25 22:13:19]

optional: you may keep if you prefer that way.

if (!has_internal() || !isactive())
  return;
?

[jonross, 2017/01/26 00:58:39]

Done.

+  }
   if (on && !IsMaximizeModeWindowManagerEnabled())
     EnterMaximizeMode();
 }
 
 void MaximizeModeController::SuspendImminent() {
   // The system is about to suspend, so record TouchView usage interval metrics
   // based on whether TouchView mode is currently active.
   RecordTouchViewUsageInterval(CurrentTouchViewIntervalType());
 }
 
@@ skipping 113 matching lines @@
 // their original position.
 void MaximizeModeController::OnMaximizeModeEnded() {
   RecordTouchViewUsageInterval(TOUCH_VIEW_INTERVAL_ACTIVE);
 }
 
 void MaximizeModeController::OnDisplayConfigurationChanged() {
   if (!display::Display::HasInternalDisplay() ||
       !WmShell::Get()->IsActiveDisplayId(
           display::Display::InternalDisplayId())) {
     LeaveMaximizeMode();
+  } else if (tablet_mode_switch_is_on_ &&
+             !IsMaximizeModeWindowManagerEnabled()) {
+    // The internal display has returned, as we are exiting docked mode.
+    // The device is still in tablet mode, so trigger maximize mode, as this
+    // switch leads to the ignoring of accelerometer events. When the switch is
+    // not set the next stable accelerometer readings will trigger maximize
+    // mode.
+    EnterMaximizeMode();
   }
 }
 
 void MaximizeModeController::RecordTouchViewUsageInterval(
     TouchViewIntervalType type) {
   if (!CanEnterMaximizeMode())
     return;
 
   base::Time current_time = base::Time::Now();
   base::TimeDelta delta = current_time - touchview_usage_interval_start_time_;
@@ skipping 55 matching lines @@
   return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds;
 }
 
 void MaximizeModeController::SetTickClockForTest(
     std::unique_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = std::move(tick_clock);
 }
 
 }  // namespace ash