Rename gfx::Display/Screen to display::Display/Screen in ash

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"
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/views/controls/label.h"
 
 namespace ash {
 
 base::string16 GetTooltipText(const base::string16& headline,
                               const base::string16& name1,
                               const std::string& data1,
@@ skipping 187 matching lines @@
       IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING_NO_INTERNAL);
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(GetMirroredTooltipText(expected, GetFirstDisplayName(), "400x400"),
             GetTrayDisplayTooltipText());
   CheckAccessibleName();
 }
 
 TEST_F(TrayDisplayTest, InternalDisplay) {
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
+  display::Display::SetInternalDisplayId(display_manager->first_display_id());
 
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // Extended
   UpdateDisplay("400x400,200x200");
   base::string16 expected = l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName());
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
@@ skipping 13 matching lines @@
                                         GetMirroringDisplayName());
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(GetMirroredTooltipText(expected, GetFirstDisplayName(), "400x400"),
             GetTrayDisplayTooltipText());
   CheckAccessibleName();
 }
 
 TEST_F(TrayDisplayTest, InternalDisplayResized) {
   UpdateDisplay("400x400@1.5");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
+  display::Display::SetInternalDisplayId(display_manager->first_display_id());
 
   // Shows the tray_display even though there's a single-display.
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
   base::string16 internal_info = l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
       GetFirstDisplayName(), base::UTF8ToUTF16("600x600"));
   EXPECT_EQ(internal_info, GetTrayDisplayText());
   EXPECT_EQ(GetTooltipText(base::string16(), GetFirstDisplayName(), "600x600",
                            base::string16(), std::string()),
@@ skipping 20 matching lines @@
   expected = l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING,
                                         GetMirroringDisplayName());
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(GetMirroredTooltipText(expected, GetFirstDisplayName(), "600x600"),
             GetTrayDisplayTooltipText());
   CheckAccessibleName();
 
   // Closed lid mode.
   display_manager->SetSoftwareMirroring(false);
   UpdateDisplay("400x400@1.5,200x200");
-  gfx::Display::SetInternalDisplayId(ScreenUtil::GetSecondaryDisplay().id());
+  display::Display::SetInternalDisplayId(
+      ScreenUtil::GetSecondaryDisplay().id());
   UpdateDisplay("400x400@1.5");
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
   expected = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(
       GetTooltipText(
           expected, GetFirstDisplayName(), "600x600", base::string16(), ""),
       GetTrayDisplayTooltipText());
   CheckAccessibleName();
 
   // Unified mode
   display_manager->SetUnifiedDesktopEnabled(true);
   UpdateDisplay("300x200,400x500");
   // Update the cache variables as the primary root window changed.
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
   expected = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED);
   EXPECT_EQ(expected, GetTrayDisplayText());
 }
 
 TEST_F(TrayDisplayTest, ExternalDisplayResized) {
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
+  display::Display::SetInternalDisplayId(display_manager->first_display_id());
 
   // Shows the tray_display even though there's a single-display.
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // Extended
   UpdateDisplay("400x400,200x200@1.5");
-  const gfx::Display& secondary_display = ScreenUtil::GetSecondaryDisplay();
+  const display::Display& secondary_display = ScreenUtil::GetSecondaryDisplay();
 
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
   base::string16 expected = l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
       l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
           GetSecondDisplayName(),
           base::UTF8ToUTF16(secondary_display.size().ToString())));
   EXPECT_EQ(expected, GetTrayDisplayText());
@@ skipping 11 matching lines @@
                                         GetMirroringDisplayName());
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(GetMirroredTooltipText(expected, GetFirstDisplayName(), "400x400"),
             GetTrayDisplayTooltipText());
   CheckAccessibleName();
 }
 
 TEST_F(TrayDisplayTest, OverscanDisplay) {
   UpdateDisplay("400x400,300x300/o");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
+  display::Display::SetInternalDisplayId(display_manager->first_display_id());
 
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
 
   // /o creates the default overscan, and if overscan is set, the annotation
   // should be the size.
   base::string16 overscan = l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION_OVERSCAN);
   base::string16 headline = l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
@@ skipping 61 matching lines @@
 }
 
 TEST_F(TrayDisplayTest, DisplayNotifications) {
   test::TestSystemTrayDelegate* tray_delegate =
       static_cast<test::TestSystemTrayDelegate*>(
           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());
+  display::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)),
             GetDisplayNotificationAdditionalText());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
@@ skipping 71 matching lines @@
   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)),
             GetDisplayNotificationAdditionalText());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // Enters closed lid mode.
   UpdateDisplay("400x400@1.5,200x200");
-  gfx::Display::SetInternalDisplayId(ScreenUtil::GetSecondaryDisplay().id());
+  display::Display::SetInternalDisplayId(
+      ScreenUtil::GetSecondaryDisplay().id());
   UpdateDisplay("400x400@1.5");
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
             GetDisplayNotificationText());
   EXPECT_EQ(
       ash::SubstituteChromeOSDeviceType(
         IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
       GetDisplayNotificationAdditionalText());
 }
 
 TEST_F(TrayDisplayTest, DisplayConfigurationChangedTwice) {
@@ skipping 39 matching lines @@
                     IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
             GetDisplayNotificationAdditionalText());
 }
 
 // Tests that when the only change is rotation, that it is only displayed when
 // caused by user changes, and not by accelerometers.
 TEST_F(TrayDisplayTest, RotationOnInternalDisplay) {
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const int64_t display_id = display_manager->first_display_id();
-  gfx::Display::SetInternalDisplayId(display_id);
+  display::Display::SetInternalDisplayId(display_id);
 
   GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // Accelerometer change does not display.
   display_manager->SetDisplayRotation(
-      display_id, gfx::Display::ROTATE_90,
-      gfx::Display::ROTATION_SOURCE_ACCELEROMETER);
+      display_id, display::Display::ROTATE_90,
+      display::Display::ROTATION_SOURCE_ACCELEROMETER);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // User change does.
-  display_manager->SetDisplayRotation(display_id, gfx::Display::ROTATE_180,
-                                      gfx::Display::ROTATION_SOURCE_USER);
+  display_manager->SetDisplayRotation(display_id, display::Display::ROTATE_180,
+                                      display::Display::ROTATION_SOURCE_USER);
   EXPECT_TRUE(IsDisplayVisibleInTray());
 
   // If a user setting matches the accelerometer, do not display if caused by
   // the accelerometer.
   display_manager->SetDisplayRotation(
-      display_id, gfx::Display::ROTATE_180,
-      gfx::Display::ROTATION_SOURCE_ACCELEROMETER);
+      display_id, display::Display::ROTATE_180,
+      display::Display::ROTATION_SOURCE_ACCELEROMETER);
   EXPECT_FALSE(IsDisplayVisibleInTray());
 
   // If a non-rotation setting is changed, display regardless of the source of
   // rotation so that the full message is shown.
   UpdateDisplay("400x400@1.5");
   EXPECT_TRUE(IsDisplayVisibleInTray());
 }
 
 }  // namespace ash