Lock rotation when screen is manually rotated.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index c0a176517c1f7c883e2d26096454cb7f43f70fb0..3fa330b21dbcaf6d6d35ab76064aaeecaddc9634 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -477,6 +477,11 @@ bool Shell::IsMaximizeModeWindowManagerEnabled() {
   return maximize_mode_window_manager_.get() != NULL;
 }
 
+bool Shell::ShouldSaveDisplaySettings() {
+  return !(IsMaximizeModeWindowManagerEnabled() &&
+           maximize_mode_controller_->in_set_screen_rotation());
+}
+
 void Shell::UpdateShelfVisibility() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();