Store rotation/ui scale to local state.

chrome/browser/chromeos/display/overscan_calibrator.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/overscan_calibrator.h"
 
 #include "ash/display/display_controller.h"
+#include "ash/display/display_info.h"
+#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/display/display_preferences.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 
 namespace chromeos {
 namespace {
 
 // The opacity for the grey out borders.
 const float kBorderOpacity = 0.5;
 
@@ skipping 43 matching lines @@
     const gfx::Display& target_display, const gfx::Insets& initial_insets)
     : display_(target_display),
       insets_(initial_insets),
       initial_insets_(initial_insets),
       committed_(false) {
   // Undo the overscan calibration temporarily so that the user can see
   // dark boundary and current overscan region.
   ash::Shell::GetInstance()->display_controller()->SetOverscanInsets(
       display_.id(), gfx::Insets());
 
+  ash::internal::DisplayInfo info = ash::Shell::GetInstance()->
+      display_manager()->GetDisplayInfo(display_.id());
+  if (info.has_overscan()) {
+    info.clear_has_custom_overscan_insets();
+    info.UpdateDisplaySize();
+    native_insets_ = info.overscan_insets_in_dip();
+  }
+
   aura::RootWindow* root = ash::Shell::GetInstance()->display_controller()->
       GetRootWindowForDisplayId(display_.id());
   ui::Layer* parent_layer = ash::Shell::GetContainer(
       root, ash::internal::kShellWindowId_OverlayContainer)->layer();
 
   calibration_layer_.reset(new ui::Layer());
   calibration_layer_->SetOpacity(0.5f);
   calibration_layer_->SetBounds(parent_layer->bounds());
   calibration_layer_->set_delegate(this);
   parent_layer->Add(calibration_layer_.get());
 }
 
 OverscanCalibrator::~OverscanCalibrator() {
   // Overscan calibration has finished without commit, so the display has to
   // be the original offset.
   if (!committed_) {
     ash::Shell::GetInstance()->display_controller()->SetOverscanInsets(
         display_.id(), initial_insets_);
   }
 }
 
 void OverscanCalibrator::Commit() {
-  SetAndStoreDisplayOverscan(display_, insets_);
+  if (insets_ == native_insets_) {

[Jun Mukai, 2013/03/22 00:53:07]

Can we move this logic to the display controller?
This sounds generic to overscan itself, not specific to the calibration UI.

[oshima, 2013/03/22 02:06:51]

I think this is specific to calibration UI. There is a difference between
clearing
and setting, and the custom insets is supposed to override native insets when
specified. If you set the insets, then it should be saved instead of ignoring
it.

+    ash::Shell::GetInstance()->display_controller()->ClearCustomOverscanInsets(
+        display_.id());
+  } else {
+    ash::Shell::GetInstance()->display_controller()->SetOverscanInsets(
+        display_.id(), insets_);
+  }
   committed_ = true;
 }
 
+void OverscanCalibrator::Reset() {
+  if (!native_insets_.empty()) {
+    insets_ = native_insets_;
+  } else {
+    insets_ = initial_insets_;
+  }
+  calibration_layer_->SchedulePaint(calibration_layer_->bounds());
+}
+
 void OverscanCalibrator::UpdateInsets(const gfx::Insets& insets) {
   insets_.Set(std::max(insets.top(), 0),
               std::max(insets.left(), 0),
               std::max(insets.bottom(), 0),
               std::max(insets.right(), 0));
   calibration_layer_->SchedulePaint(calibration_layer_->bounds());
 }
 
 void OverscanCalibrator::OnPaintLayer(gfx::Canvas* canvas) {
   static const SkColor kTransparent = SkColorSetARGB(0, 0, 0, 0);
@@ skipping 17 matching lines @@
     float device_scale_factor) {
   // TODO(mukai): Cancel the overscan calibration when the device
   // configuration has changed.
 }
 
 base::Closure OverscanCalibrator::PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 }  // namespace chromeos