Save display preference when all display configuration changes has been completed.

ash/display/display_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/display/display_controller.h"
 
 #include <algorithm>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 439 matching lines @@
 }
 
 void DisplayController::SetDefaultDisplayLayout(const DisplayLayout& layout) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kAshSecondaryDisplayLayout) &&
       (default_display_layout_.position != layout.position ||
        default_display_layout_.offset != layout.offset)) {
     default_display_layout_ = layout;
     NotifyDisplayConfigurationChanging();
     UpdateDisplayBoundsForLayout();
+    NotifyDisplayConfigurationChanged();
   }
 }
 
 void DisplayController::RegisterLayoutForDisplayIdPair(
     int64 id1,
     int64 id2,
     const DisplayLayout& layout) {
   RegisterLayoutForDisplayIdPairInternal(id1, id2, layout, true);
 }
 
@@ skipping 21 matching lines @@
   // Invert if the primary was swapped.
   DisplayLayout to_set = pair.first == primary.id() ?
       layout_relative_to_primary : layout_relative_to_primary.Invert();
 
   const DisplayLayout& current_layout = paired_layouts_[pair];
   if (to_set.position != current_layout.position ||
       to_set.offset != current_layout.offset) {
     paired_layouts_[pair] = to_set;
     NotifyDisplayConfigurationChanging();
     UpdateDisplayBoundsForLayout();
+    NotifyDisplayConfigurationChanged();
   }
 }
 
 DisplayLayout DisplayController::GetCurrentDisplayLayout() const {
   DCHECK_EQ(2U, GetDisplayManager()->GetNumDisplays());
   // Invert if the primary was swapped.
   if (GetDisplayManager()->GetNumDisplays() > 1) {
     DisplayIdPair pair = GetCurrentDisplayIdPair();
     DisplayLayout layout = GetRegisteredDisplayLayout(pair);
     const gfx::Display& primary = GetPrimaryDisplay();
@@ skipping 152 matching lines @@
       display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);
 }
 
 void DisplayController::OnDisplayBoundsChanged(const gfx::Display& display) {
   if (limiter_.get())
     limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
   const internal::DisplayInfo& display_info =
       GetDisplayManager()->GetDisplayInfo(display);
   DCHECK(!display_info.bounds_in_pixel().IsEmpty());
 
-  NotifyDisplayConfigurationChanging();
   UpdateDisplayBoundsForLayout();
   aura::RootWindow* root = root_windows_[display.id()];
   root->SetHostBoundsAndInsetsAndRootWindowScale(
       display_info.bounds_in_pixel(),
       display_info.GetOverscanInsetsInPixel(),
       display_info.ui_scale());
   SetDisplayPropertiesOnHostWindow(root, display);
 }
 
 void DisplayController::OnDisplayAdded(const gfx::Display& display) {
   if (limiter_.get())
     limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
 
-  NotifyDisplayConfigurationChanging();
   if (primary_root_window_for_replace_) {
     DCHECK(root_windows_.empty());
     primary_display_id = display.id();
     root_windows_[display.id()] = primary_root_window_for_replace_;
     primary_root_window_for_replace_->SetProperty(
         internal::kDisplayIdKey, display.id());
     primary_root_window_for_replace_ = NULL;
     UpdateDisplayBoundsForLayout();
     const internal::DisplayInfo& display_info =
         GetDisplayManager()->GetDisplayInfo(display);
@@ skipping 10 matching lines @@
     Shell::GetInstance()->InitRootWindowForSecondaryDisplay(root);
   }
 }
 
 void DisplayController::OnDisplayRemoved(const gfx::Display& display) {
   if (limiter_.get())
     limiter_->SetThrottleTimeout(kAfterDisplayChangeThrottleTimeoutMs);
 
   aura::RootWindow* root_to_delete = root_windows_[display.id()];
   DCHECK(root_to_delete) << display.ToString();
-  NotifyDisplayConfigurationChanging();
 
   // Display for root window will be deleted when the Primary RootWindow
   // is deleted by the Shell.
   root_windows_.erase(display.id());
 
   // When the primary root window's display is removed, move the primary
   // root to the other display.
   if (primary_display_id == display.id()) {
     // Temporarily store the primary root window in
     // |primary_root_window_for_replace_| when replacing the display.
@@ skipping 110 matching lines @@
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 void DisplayController::NotifyDisplayConfigurationChanging() {
   FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanging());
 }
 
+void DisplayController::NotifyDisplayConfigurationChanged() {
+  FOR_EACH_OBSERVER(Observer, observers_, OnDisplayConfigurationChanged());
+}
+
 void DisplayController::RegisterLayoutForDisplayIdPairInternal(
     int64 id1,
     int64 id2,
     const DisplayLayout& layout,
     bool override) {
   DisplayIdPair pair;
   pair.first = id1;
   pair.second = id2;
   if (override || paired_layouts_.find(pair) == paired_layouts_.end())
     paired_layouts_[pair] = layout;
 }
 
 void DisplayController::OnFadeOutForSwapDisplayFinished() {
 #if defined(OS_CHROMEOS)
   SetPrimaryDisplay(ScreenAsh::GetSecondaryDisplay());
   Shell::GetInstance()->output_configurator_animation()->StartFadeInAnimation();
 #endif
 }
 
 }  // namespace ash