Put display messages as 'additional' message.

ash/system/chromeos/tray_display_unittest.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/system/chromeos/tray_display.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 405 matching lines @@
           Shell::GetInstance()->system_tray_delegate());
   tray_delegate->set_should_show_display_notification(true);
 
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // rotation.
   UpdateDisplay("400x400/r");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetFirstDisplayName(),
-          l10n_util::GetStringUTF16(
-              IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetFirstDisplayName(),
+                l10n_util::GetStringUTF16(
+                    IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   CloseNotification();
   UpdateDisplay("400x400");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetFirstDisplayName(),
-          l10n_util::GetStringUTF16(
-              IDS_ASH_STATUS_TRAY_DISPLAY_STANDARD_ORIENTATION)),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetFirstDisplayName(),
+                l10n_util::GetStringUTF16(
+                    IDS_ASH_STATUS_TRAY_DISPLAY_STANDARD_ORIENTATION)),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // UI-scale
   CloseNotification();
   UpdateDisplay("400x400@1.5");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
-          GetFirstDisplayName(), base::UTF8ToUTF16("600x600")),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
+                GetFirstDisplayName(), base::UTF8ToUTF16("600x600")),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // UI-scale to 1.0
   CloseNotification();
   UpdateDisplay("400x400");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
-          GetFirstDisplayName(), base::UTF8ToUTF16("400x400")),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
+                GetFirstDisplayName(), base::UTF8ToUTF16("400x400")),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // No-update
   CloseNotification();
   UpdateDisplay("400x400");
   EXPECT_TRUE(GetDisplayNotificationText().empty());
   EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
 
   // Extended.
   CloseNotification();
   UpdateDisplay("400x400,200x200");
@@ skipping 17 matching lines @@
   display_manager->SetSoftwareMirroring(false);
   UpdateDisplay("400x400,200x200");
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName()),
       GetDisplayNotificationText());
   EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
 
   // Resize the first display.
   UpdateDisplay("400x400@1.5,200x200");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
-          GetFirstDisplayName(), base::UTF8ToUTF16("600x600")),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_RESOLUTION_CHANGED,
+                GetFirstDisplayName(), base::UTF8ToUTF16("600x600")),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // Rotate the second.
   UpdateDisplay("400x400@1.5,200x200/r");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED,
-          GetSecondDisplayName(),
-          l10n_util::GetStringUTF16(
-              IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
-      GetDisplayNotificationText());
-  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(),
+                l10n_util::GetStringUTF16(
+                    IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
+            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // Enters closed lid mode.
   UpdateDisplay("400x400@1.5,200x200");
   gfx::Display::SetInternalDisplayId(ScreenUtil::GetSecondaryDisplay().id());
   UpdateDisplay("400x400@1.5");
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
             GetDisplayNotificationText());
   EXPECT_EQ(
       l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
       GetDisplayNotificationAdditionalText());
@@ skipping 29 matching lines @@
 TEST_F(TrayDisplayTest, UpdateAfterSuppressDisplayNotification) {
   UpdateDisplay("400x400,200x200");
 
   test::TestSystemTrayDelegate* tray_delegate =
       static_cast<test::TestSystemTrayDelegate*>(
           Shell::GetInstance()->system_tray_delegate());
   tray_delegate->set_should_show_display_notification(true);
 
   // rotate the second.
   UpdateDisplay("400x400,200x200/r");
-  EXPECT_EQ(
-      l10n_util::GetStringFUTF16(
-          IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED,
-          GetSecondDisplayName(),
-          l10n_util::GetStringUTF16(
-              IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
-      GetDisplayNotificationText());
+  EXPECT_EQ(l10n_util::GetStringFUTF16(
+                IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(),
+                l10n_util::GetStringUTF16(
+                    IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
+            GetDisplayNotificationAdditionalText());
 }
 
 }  // namespace ash