Fix errors in display resolution change notifications

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 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/extensions/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/display/display_configuration_controller.h"
@@ skipping 322 matching lines @@
         new display::ManagedDisplayMode(
             size, current_mode->refresh_rate(), current_mode->is_interlaced(),
             info.display_mode->is_native, info.display_mode->ui_scale,
             info.display_mode->device_scale_factor));
 
     if (new_mode->IsEquivalent(current_mode)) {
       *error = "Display mode matches current mode.";
       return false;
     }
 
-    if (!display_manager->SetDisplayMode(id, new_mode)) {
+    // If it's the internal display, the display mode will be applied directly,
+    // otherwise a confirm/revert notification will be prepared first, and the
+    // display mode will be applied. If the user accepts the mode change by
+    // dismissing the notification, StoreDisplayPrefs() will be called back to
+    // persist the new preferences.
+    if (!ash::Shell::Get()
+             ->resolution_notification_controller()
+             ->PrepareNotificationAndSetDisplayMode(
+                 id, current_mode, new_mode,
+                 base::Bind(&chromeos::StoreDisplayPrefs))) {
       *error = "Unable to set the display mode.";
       return false;
     }
-
-    if (!display::Display::IsInternalDisplayId(id)) {
-      // For external displays, show a notification confirming the resolution
-      // change.
-      ash::Shell::Get()
-          ->resolution_notification_controller()
-          ->PrepareNotification(id, current_mode, new_mode,
-                                base::Bind(&chromeos::StoreDisplayPrefs));
-    }
   }
   return true;
 }
 
 system_display::DisplayMode GetDisplayMode(
     display::DisplayManager* display_manager,
     const display::ManagedDisplayInfo& display_info,
     const scoped_refptr<display::ManagedDisplayMode>& display_mode) {
   system_display::DisplayMode result;
 
@@ skipping 522 matching lines @@
     touch_calibrator_.reset(new chromeos::TouchCalibratorController);
   return touch_calibrator_.get();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions