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 "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/user_manager.h"
 #include "chrome/common/pref_names.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "url/url_canon.h"
 #include "url/url_util.h"
 
 namespace chromeos {
 namespace {
 
 const char kInsetsTopKey[] = "insets_top";
@@ skipping 188 matching lines @@
   base::DictionaryValue* pref_data = update.Get();
 
   size_t num = display_manager->GetNumDisplays();
   for (size_t i = 0; i < num; ++i) {
     const gfx::Display& display = display_manager->GetDisplayAt(i);
     int64 id = display.id();
     ash::DisplayInfo info = display_manager->GetDisplayInfo(id);
 
     scoped_ptr<base::DictionaryValue> property_value(
         new base::DictionaryValue());
-    property_value->SetInteger("rotation", static_cast<int>(info.rotation()));
+    property_value->SetInteger("rotation", static_cast<int>(info.GetRotation(
+        ui::USER)));
     property_value->SetInteger(
         "ui-scale",
         static_cast<int>(info.configured_ui_scale() * 1000));
     ash::DisplayMode mode;
     if (!display.IsInternal() &&
         display_manager->GetSelectedModeForDisplayId(id, &mode) &&
         !mode.native) {
       property_value->SetInteger("width", mode.size.width());
       property_value->SetInteger("height", mode.size.height());
     }
@@ skipping 95 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