Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: ash/system/chromeos/tray_display_unittest.cc

Issue 922843002: Fix software mirror mode on Ozone part 2/2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/tray_display.h" 5 #include "ash/system/chromeos/tray_display.h"
6 6
7 #include "ash/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 base::string16 GetSecondDisplayName() { 62 base::string16 GetSecondDisplayName() {
63 return base::UTF8ToUTF16( 63 return base::UTF8ToUTF16(
64 Shell::GetInstance()->display_manager()->GetDisplayNameForId( 64 Shell::GetInstance()->display_manager()->GetDisplayNameForId(
65 ScreenUtil::GetSecondaryDisplay().id())); 65 ScreenUtil::GetSecondaryDisplay().id()));
66 } 66 }
67 67
68 base::string16 GetMirroredDisplayName() { 68 base::string16 GetMirroredDisplayName() {
69 DisplayManager* display_manager = Shell::GetInstance()->display_manager(); 69 DisplayManager* display_manager = Shell::GetInstance()->display_manager();
70 return base::UTF8ToUTF16(display_manager->GetDisplayNameForId( 70 return base::UTF8ToUTF16(display_manager->GetDisplayNameForId(
71 display_manager->mirrored_display_id())); 71 display_manager->mirroring_display_id()));
72 } 72 }
73 73
74 class TrayDisplayTest : public ash::test::AshTestBase { 74 class TrayDisplayTest : public ash::test::AshTestBase {
75 public: 75 public:
76 TrayDisplayTest(); 76 TrayDisplayTest();
77 ~TrayDisplayTest() override; 77 ~TrayDisplayTest() override;
78 78
79 void SetUp() override; 79 void SetUp() override;
80 80
81 protected: 81 protected:
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 EXPECT_EQ( 567 EXPECT_EQ(
568 l10n_util::GetStringFUTF16( 568 l10n_util::GetStringFUTF16(
569 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, 569 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED,
570 GetSecondDisplayName(), 570 GetSecondDisplayName(),
571 l10n_util::GetStringUTF16( 571 l10n_util::GetStringUTF16(
572 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)), 572 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
573 GetDisplayNotificationText()); 573 GetDisplayNotificationText());
574 } 574 }
575 575
576 } // namespace ash 576 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698