Lock rotation when screen is manually rotated.

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 459 matching lines @@
     maximize_mode_window_manager_.reset(new MaximizeModeWindowManager());
   } else if (!enable && maximize_mode_window_manager_.get()) {
     maximize_mode_window_manager_.reset();
   }
 }
 
 bool Shell::IsMaximizeModeWindowManagerEnabled() {
   return maximize_mode_window_manager_.get() != NULL;
 }
 
+bool Shell::ShouldSaveDisplaySettings() {
+  return !((IsMaximizeModeWindowManagerEnabled() &&
+           maximize_mode_controller_->in_set_screen_rotation()) ||

[flackr, 2014/05/26 16:05:18]

nit: I would indent maximize_mode_controller_ either to the IsMaximize... or by
4 from that to show that it is part of that inner condition as opposed to
resolution_notification_controller which is part of the outer one.

[jonross, 2014/05/26 19:05:48]

Done.

+           resolution_notification_controller_->DoesNotificationTimeout());
+}
+
 void Shell::UpdateShelfVisibility() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     if ((*iter)->shelf())
       (*iter)->UpdateShelfVisibility();
 }
 
 void Shell::SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior,
                                      aura::Window* root_window) {
@@ skipping 651 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash