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

Side by Side Diff: ash/display/display_error_observer_chromeos_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/display/display_error_observer_chromeos.h ('k') | ash/display/display_manager.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/display/display_error_observer_chromeos.h" 5 #include "ash/display/display_error_observer_chromeos.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "grit/ash_strings.h" 9 #include "grit/ash_strings.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 #include "ui/views/controls/label.h" 12 #include "ui/views/controls/label.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 15
16 namespace ash { 16 namespace ash {
17 17
18 class DisplayErrorObserverTest : public test::AshTestBase { 18 class DisplayErrorObserverTest : public test::AshTestBase {
19 protected: 19 protected:
20 DisplayErrorObserverTest() { 20 DisplayErrorObserverTest() {
21 } 21 }
22 22
23 virtual ~DisplayErrorObserverTest() { 23 virtual ~DisplayErrorObserverTest() {
24 } 24 }
25 25
26 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() override {
27 test::AshTestBase::SetUp(); 27 test::AshTestBase::SetUp();
28 observer_.reset(new DisplayErrorObserver()); 28 observer_.reset(new DisplayErrorObserver());
29 } 29 }
30 30
31 protected: 31 protected:
32 DisplayErrorObserver* observer() { return observer_.get(); } 32 DisplayErrorObserver* observer() { return observer_.get(); }
33 33
34 base::string16 GetMessageContents() { 34 base::string16 GetMessageContents() {
35 return observer_->GetTitleOfDisplayErrorNotificationForTest(); 35 return observer_->GetTitleOfDisplayErrorNotificationForTest();
36 } 36 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING), 75 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
76 GetMessageContents()); 76 GetMessageContents());
77 77
78 observer()->OnDisplayModeChangeFailed( 78 observer()->OnDisplayModeChangeFailed(
79 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED); 79 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
80 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING), 80 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
81 GetMessageContents()); 81 GetMessageContents());
82 } 82 }
83 83
84 } // namespace ash 84 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_observer_chromeos.h ('k') | ash/display/display_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698