Lock rotation when screen is manually rotated.

chrome/browser/chromeos/display/display_preferences.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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
@@ skipping 280 matching lines @@
   // state respects to the current status (close/open) of the lid which can be
   // changed in any situation. See crbug.com/285360
   StoreCurrentDisplayPowerState();
 
   // Do not store prefs when the confirmation dialog is shown.
   if (!UserCanSaveDisplayPreference() ||
       ash::Shell::GetInstance()->resolution_notification_controller()->
           DoesNotificationTimeout()) {
     return;
   }
+
+  if (!ash::Shell::GetInstance()->ShouldSaveDisplaySettings())

[oshima, 2014/05/23 19:15:05]

Sorry if it wasn't clear. I wanted something like

if (!UserCanSaveDisplayPreferene() ||
    !ash::Shell::GetInstance()->ShouldSaveDisplaySettings()) {
  return;
}

and remove the dependency to resolution_notification_controller and
maximize_mode_contoroller from this class.

[jonross, 2014/05/23 19:52:14]

Done.

+    return;
+
   StoreCurrentDisplayLayoutPrefs();
   StoreCurrentDisplayProperties();
 }
 
 void SetCurrentDisplayLayout(const ash::DisplayLayout& layout) {
   GetDisplayManager()->SetLayoutForCurrentDisplays(layout);
 }
 
 void LoadDisplayPreferences(bool first_run_after_boot) {
   LoadDisplayLayouts();
@@ skipping 16 matching lines @@
                                    const ash::DisplayLayout& layout) {
   StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos