Updates the list of display info in TrayDisplay even if notification is prevented.

ash/system/chromeos/tray_display.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/system/chromeos/tray_display.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/actionable_view.h"
@@ skipping 308 matching lines @@
  private:
   user::LoginStatus login_status_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayNotificationView);
 };
 
 TrayDisplay::TrayDisplay(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       default_(NULL) {
   Shell::GetInstance()->display_controller()->AddObserver(this);
+  UpdateDisplayInfo(NULL);
 }
 
 TrayDisplay::~TrayDisplay() {
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
 }
 
-bool TrayDisplay::GetDisplayMessageForNotification(base::string16* message) {
+void TrayDisplay::UpdateDisplayInfo(TrayDisplay::DisplayInfoMap* old_info) {
+  if (old_info) {
+    old_info->clear();
+    old_info->swap(display_info_);
+  } else {
+    display_info_.clear();
+  }

[stevenjb, 2013/08/12 21:52:07]

Isn't this the same as:

if (old_info)
  old_info->swap(display_info_);
display_info_.clear();

? I think that would be more clear.

[Jun Mukai, 2013/08/12 22:07:49]

good catch. fixed as you suggested.

+
   DisplayManager* display_manager = GetDisplayManager();
-  DisplayInfoMap old_info;
-  old_info.swap(display_info_);
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     int64 id = display_manager->GetDisplayAt(i).id();
     display_info_[id] = display_manager->GetDisplayInfo(id);
   }
+}
 
+bool TrayDisplay::GetDisplayMessageForNotification(
+    base::string16* message, const TrayDisplay::DisplayInfoMap& old_info) {

[stevenjb, 2013/08/12 21:52:07]

one arg per line

[Jun Mukai, 2013/08/12 22:07:49]

Done.

   // Display is added or removed. Use the same message as the one in
   // the system tray.
   if (display_info_.size() != old_info.size()) {
     *message = GetTrayDisplayMessage();
     return true;
   }
 
   for (DisplayInfoMap::const_iterator iter = display_info_.begin();
        iter != display_info_.end(); ++iter) {
     DisplayInfoMap::const_iterator old_iter = old_info.find(iter->first);
@@ skipping 44 matching lines @@
   DCHECK(default_ == NULL);
   default_ = new DisplayView(status);
   return default_;
 }
 
 void TrayDisplay::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayDisplay::OnDisplayConfigurationChanged() {
+  DisplayInfoMap old_info;
+  UpdateDisplayInfo(&old_info);
+
   if (!Shell::GetInstance()->system_tray_delegate()->
           ShouldShowDisplayNotification()) {
     return;
   }
 
   base::string16 message;
-  if (GetDisplayMessageForNotification(&message))
+  if (GetDisplayMessageForNotification(&message, old_info))
     UpdateDisplayNotification(message);
 }
 
 base::string16 TrayDisplay::GetDefaultViewMessage() {
   if (!default_ || !default_->visible())
     return base::string16();
 
   return static_cast<DisplayView*>(default_)->label()->text();
 }
 
 base::string16 TrayDisplay::GetNotificationMessage() {
   message_center::NotificationList::Notifications notifications =
       message_center::MessageCenter::Get()->GetNotifications();
   for (message_center::NotificationList::Notifications::const_iterator iter =
            notifications.begin(); iter != notifications.end(); ++iter) {
     if ((*iter)->id() == kDisplayNotificationId)
       return (*iter)->title();
   }
 
   return base::string16();
 }
 
 void TrayDisplay::CloseNotificationForTest() {
   message_center::MessageCenter::Get()->RemoveNotification(
       kDisplayNotificationId, false);
 }
 
 }  // namespace internal
 }  // namespace ash