Update the selected resolution to the resolution that is actually selected.

ash/display/display_manager.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_manager.h"
 
 #include <cmath>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 533 matching lines @@
       internal_display_connected = IsInternalDisplayId(iter->id());
     // Mirrored monitors have the same origins.
     gfx::Point origin = iter->bounds_in_native().origin();
     if (origins.find(origin) != origins.end()) {
       InsertAndUpdateDisplayInfo(*iter);
       mirrored_display_id_ = iter->id();
     } else {
       origins.insert(origin);
       new_display_info_list.push_back(*iter);
     }
+
+    const gfx::Size& resolution = iter->bounds_in_native().size();

[dsodman, 2013/12/16 18:15:17]

should not be a reference

[oshima, 2013/12/16 18:50:56]

This is actually a bug in DisplayInfo, but I'll fix it after branch
to avoid risks. Changed to no reference.

+    const std::vector<Resolution>& resolutions = iter->resolutions();
+    // This is empty the displays are initialized from InitFromCommandLine.
+    if (!resolutions.size())
+      continue;
+    std::vector<Resolution>::const_iterator resolution_iter =
+        std::find_if(resolutions.begin(),
+                     resolutions.end(),
+                     ResolutionMatcher(resolution));
+    // Update the actual resolution selected as the resolution request may fail.
+    if (resolution_iter == resolutions.begin())
+      resolutions_.erase(iter->id());
+    else if (resolutions_.find(iter->id()) != resolutions_.end())
+      resolutions_[iter->id()] = resolution;
   }
   if (HasInternalDisplay() &&
       !internal_display_connected &&
       display_info_.find(gfx::Display::InternalDisplayId()) ==
       display_info_.end()) {
     DisplayInfo internal_display_info(
         gfx::Display::InternalDisplayId(),
         l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME),
         false  /*Internal display must not have overscan */);
     internal_display_info.SetBounds(gfx::Rect(0, 0, 800, 600));
@@ skipping 475 matching lines @@
       break;
   }
   gfx::Insets insets = secondary_display->GetWorkAreaInsets();
   secondary_display->set_bounds(
       gfx::Rect(new_secondary_origin, secondary_bounds.size()));
   secondary_display->UpdateWorkAreaFromInsets(insets);
 }
 
 }  // namespace internal
 }  // namespace ash