Creates notifications for display resolution change.

chrome/browser/ui/webui/options/chromeos/display_options_handler.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/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/output_configurator_animation.h"
+#include "ash/display/resolution_notification_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chromeos/display/output_configurator.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 315 matching lines @@
   double height = 0.0f;
   if (!args->GetDouble(1, &width) || width == 0.0f) {
     LOG(ERROR) << "Can't find new width";
     return;
   }
   if (!args->GetDouble(2, &height) || height == 0.0f) {
     LOG(ERROR) << "Can't find new height";
     return;
   }
 
-  // TODO(mukai): creates a confirmation dialog.
-  GetDisplayManager()->SetDisplayResolution(
-      display_id, gfx::ToFlooredSize(gfx::SizeF(width, height)));
+  const ash::internal::DisplayInfo& display_info =
+      GetDisplayManager()->GetDisplayInfo(display_id);

[oshima, 2013/08/09 17:42:56]

Looks like if I set the resolution while timeout dialog is shown,
it will use the value of the new resolution, instead of
the very first time that was working?

[Jun Mukai, 2013/08/09 21:04:58]

nice catch!
Added the handling of that case in ResolutionNotificationController since it
knows the original resolution.

+  gfx::Size new_resolution = gfx::ToFlooredSize(gfx::SizeF(width, height));
+  gfx::Size old_resolution = display_info.size_in_pixel();
+  bool has_new_resolution = false;
+  bool has_old_resolution = false;
+  for (size_t i = 0; i < display_info.resolutions().size(); ++i) {
+    ash::internal::Resolution resolution = display_info.resolutions()[i];
+    if (resolution.size == new_resolution)
+      has_new_resolution = true;
+    if (resolution.size == old_resolution)
+      has_old_resolution = true;
+  }
+  if (!has_new_resolution) {
+    LOG(ERROR) << "No new resolution " << new_resolution.ToString()
+               << " is found in the display info " << display_info.ToString();
+    return;
+  }
+  if (!has_old_resolution) {
+    LOG(ERROR) << "No old resolution " << old_resolution.ToString()
+               << " is found in the display info " << display_info.ToString();
+    return;
+  }
+
+  ash::Shell::GetInstance()->resolution_notification_controller()->
+      SetDisplayResolutionAndNotify(
+          display_id, old_resolution, new_resolution,
+          base::Bind(&StoreDisplayPrefs));
 }
 
 void DisplayOptionsHandler::HandleSetOrientation(const base::ListValue* args) {
   DCHECK(!args->empty());
 
   int64 display_id = GetDisplayId(args);
   if (display_id == gfx::Display::kInvalidDisplayID)
     return;
 
   std::string rotation_value;
   gfx::Display::Rotation new_rotation = gfx::Display::ROTATE_0;
   if (!args->GetString(1, &rotation_value)) {
     LOG(ERROR) << "Can't find new orientation";
     return;
   }
   if (rotation_value == "90")
     new_rotation = gfx::Display::ROTATE_90;
   else if (rotation_value == "180")
     new_rotation = gfx::Display::ROTATE_180;
   else if (rotation_value == "270")
     new_rotation = gfx::Display::ROTATE_270;
   else if (rotation_value != "0")
     LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0";
 
   GetDisplayManager()->SetDisplayRotation(display_id, new_rotation);
 }
 
 }  // namespace options
 }  // namespace chromeos