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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/chromeos/tray_tracing.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->mirrored_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 virtual ~TrayDisplayTest(); 77 virtual ~TrayDisplayTest();
78 78
79 virtual void SetUp() OVERRIDE; 79 virtual void SetUp() override;
80 80
81 protected: 81 protected:
82 SystemTray* tray() { return tray_; } 82 SystemTray* tray() { return tray_; }
83 TrayDisplay* tray_display() { return tray_display_; } 83 TrayDisplay* tray_display() { return tray_display_; }
84 84
85 void CloseNotification(); 85 void CloseNotification();
86 bool IsDisplayVisibleInTray() const; 86 bool IsDisplayVisibleInTray() const;
87 base::string16 GetTrayDisplayText() const; 87 base::string16 GetTrayDisplayText() const;
88 void CheckAccessibleName() const; 88 void CheckAccessibleName() const;
89 base::string16 GetTrayDisplayTooltipText() const; 89 base::string16 GetTrayDisplayTooltipText() const;
(...skipping 477 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
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/chromeos/tray_tracing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698