Put display messages as 'additional' message.

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 <vector>
 
 #include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_controller.h"
@@ skipping 316 matching lines @@
     // The display's number is same but different displays. This happens
     // for the transition between docked mode and mirrored display. Falls back
     // to GetTrayDisplayMessage().
     if (old_iter == old_info.end()) {
       *message_out = DisplayView::GetTrayDisplayMessage(additional_message_out);
       return true;
     }
 
     if (iter->second.configured_ui_scale() !=
         old_iter->second.configured_ui_scale()) {
-      *message_out = l10n_util::GetStringFUTF16(
+      *additional_message_out = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
-          GetDisplayName(iter->first),
-          GetDisplaySize(iter->first));
+          GetDisplayName(iter->first), GetDisplaySize(iter->first));
       return true;
     }
     if (iter->second.rotation() != old_iter->second.rotation()) {
       int rotation_text_id = 0;
       switch (iter->second.rotation()) {
         case gfx::Display::ROTATE_0:
           rotation_text_id = IDS_ASH_STATUS_TRAY_DISPLAY_STANDARD_ORIENTATION;
           break;
         case gfx::Display::ROTATE_90:
           rotation_text_id = IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90;
           break;
         case gfx::Display::ROTATE_180:
           rotation_text_id = IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_180;
           break;
         case gfx::Display::ROTATE_270:
           rotation_text_id = IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_270;
           break;
       }
-      *message_out = l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED,
-          GetDisplayName(iter->first),
+      *additional_message_out = l10n_util::GetStringFUTF16(
+          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetDisplayName(iter->first),
           l10n_util::GetStringUTF16(rotation_text_id));
       return true;
     }
   }
 
   // Found nothing special
   return false;
 }
 
 void TrayDisplay::CreateOrUpdateNotification(
     const base::string16& message,
     const base::string16& additional_message) {
   // Always remove the notification to make sure the notification appears
   // as a popup in any situation.
   message_center::MessageCenter::Get()->RemoveNotification(
       kNotificationId, false /* by_user */);
 
-  if (message.empty())
+  if (message.empty() && additional_message.empty())
     return;
 
   // Don't display notifications for accelerometer triggered screen rotations.
   // See http://crbug.com/364949
   if (Shell::GetInstance()
           ->screen_orientation_controller()
           ->ignore_display_configuration_updates()) {
     return;
   }
 
@@ skipping 53 matching lines @@
 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {
   views::View* view = default_;
   if (view) {
     view->GetAccessibleState(state);
     return true;
   }
   return false;
 }
 
 }  // namespace ash