Fix the crash bug of close button for the resolution change notification.

ash/display/resolution_notification_controller.cc

 // Copyright 2013 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/resolution_notification_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 53 matching lines @@
 }
 
 void ResolutionChangeNotificationDelegate::Display() {
 }
 
 void ResolutionChangeNotificationDelegate::Error() {
 }
 
 void ResolutionChangeNotificationDelegate::Close(bool by_user) {
   if (by_user)
-    controller_->AcceptResolutionChange();
+    controller_->AcceptResolutionChange(false);
 }
 
 void ResolutionChangeNotificationDelegate::Click() {
-  controller_->AcceptResolutionChange();
+  controller_->AcceptResolutionChange(true);
 }
 
 bool ResolutionChangeNotificationDelegate::HasClickedListener() {
   return true;
 }
 
 void ResolutionChangeNotificationDelegate::ButtonClick(int button_index) {
   // If there's the timeout, the first button is "Accept". Otherwise the
   // button click should be "Revert".
   if (has_timeout_ && button_index == 0)
-    controller_->AcceptResolutionChange();
+    controller_->AcceptResolutionChange(true);
   else
     controller_->RevertResolutionChange();
 }
 
 }  // namespace
 
 // static
 const int ResolutionNotificationController::kTimeoutInSec = 15;
 
 // static
@@ skipping 136 matching lines @@
   if (!change_info_)
     return;
 
   --change_info_->timeout_count;
   if (change_info_->timeout_count == 0)
     RevertResolutionChange();
   else
     CreateOrUpdateNotification();
 }
 
-void ResolutionNotificationController::AcceptResolutionChange() {
-  message_center::MessageCenter::Get()->RemoveNotification(
-      kNotificationId, false /* by_user */);
+void ResolutionNotificationController::AcceptResolutionChange(
+    bool close_notification) {
+  if (close_notification) {
+    message_center::MessageCenter::Get()->RemoveNotification(
+        kNotificationId, false /* by_user */);
+  }
   base::Closure callback = change_info_->accept_callback;
   change_info_.reset();
   callback.Run();
 }
 
 void ResolutionNotificationController::RevertResolutionChange() {
   message_center::MessageCenter::Get()->RemoveNotification(
       kNotificationId, false /* by_user */);
   int64 display_id = change_info_->display_id;
   gfx::Size old_resolution = change_info_->old_resolution;
@@ skipping 28 matching lines @@
                               &ResolutionNotificationController::OnTimerTick);
   }
 }
 
 void ResolutionNotificationController::SuppressTimerForTest() {
   g_use_timer = false;
 }
 
 }  // namespace internal
 }  // namespace ash