Store rotation/ui scale to local state.

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 152 matching lines @@
       return gfx::Display::ROTATE_180;
     case gfx::Display::ROTATE_180:
       return gfx::Display::ROTATE_270;
     case gfx::Display::ROTATE_270:
       return gfx::Display::ROTATE_0;
   }
   NOTREACHED() << "Unknown rotation:" << current;
   return gfx::Display::ROTATE_0;
 }
 
-float GetNextScale(float scale, bool up) {
-  // These scales are equivalent to 1024, 1280, 1600 and 1920 pixel width
-  // respectively on 2560 pixel width 2x density display.
-  static const float kScales[] = {0.8f, 1.0f, 1.25f, 1.5f};
-  static const size_t kScaleTableSize = arraysize(kScales);
-  for (size_t i = 0; i < kScaleTableSize; ++i) {
-    if (kScales[i] == scale) {
-      if (up && i != kScaleTableSize -1)
-        return kScales[i + 1];
-      if (!up && i != 0)
-        return kScales[i - 1];
-      return kScales[i];
-    }
-  }
-  // Fallback to 1.0f if the |scale| wasn't in the list.
-  return 1.0f;
-}
-
 bool HandleScaleUI(bool up) {
   // UI Scaling is effective only on internal display.
   int64 display_id = gfx::Display::InternalDisplayId();
 #if defined(OS_CHROMEOS)
   // On linux desktop, allow ui scalacing on the first dislpay.
   if (!base::chromeos::IsRunningOnChromeOS())
     display_id = Shell::GetInstance()->display_manager()->first_display_id();
 #endif
-  const gfx::Display& display = Shell::GetInstance()->display_manager()->
-      GetDisplayForId(display_id);
   const DisplayInfo& display_info = Shell::GetInstance()->display_manager()->
-      GetDisplayInfo(display);
+      GetDisplayInfo(display_id);
   Shell::GetInstance()->display_manager()->SetDisplayUIScale(
-      display.id(), GetNextScale(display_info.ui_scale(), up));
+      display_id,
+      internal::DisplayManager::GetNextUIScale(display_info.ui_scale(), up));
   return true;
 }
 
 // Rotates the screen.
 bool HandleRotateScreen() {
   gfx::Point point = Shell::GetScreen()->GetCursorScreenPoint();
   gfx::Display display = Shell::GetScreen()->GetDisplayNearestPoint(point);
   const DisplayInfo& display_info =
-      Shell::GetInstance()->display_manager()->GetDisplayInfo(display);
+      Shell::GetInstance()->display_manager()->GetDisplayInfo(display.id());
   Shell::GetInstance()->display_manager()->SetDisplayRotation(
       display.id(), GetNextRotation(display_info.rotation()));
   return true;
 }
 
 bool HandleToggleDesktopBackgroundMode() {
   DesktopBackgroundController* desktop_background_controller =
       Shell::GetInstance()->desktop_background_controller();
   if (desktop_background_controller->desktop_background_mode() ==
       DesktopBackgroundController::BACKGROUND_IMAGE) {
@@ skipping 692 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash