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

Side by Side Diff: ash/display/display_error_observer_chromeos_unittest.cc

Issue 1190783003: Move "Dear Monitor..." error text from the notification title field to the message field to prevent… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move "Dear Monitor..." error text from the notification title field to the message field to prevent… Created 5 years, 6 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.cc ('k') | no next file » | 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"
(...skipping 13 matching lines...) Expand all
24 24
25 void SetUp() override { 25 void SetUp() override {
26 test::AshTestBase::SetUp(); 26 test::AshTestBase::SetUp();
27 observer_.reset(new DisplayErrorObserver()); 27 observer_.reset(new DisplayErrorObserver());
28 } 28 }
29 29
30 protected: 30 protected:
31 DisplayErrorObserver* observer() { return observer_.get(); } 31 DisplayErrorObserver* observer() { return observer_.get(); }
32 32
33 base::string16 GetMessageContents() { 33 base::string16 GetMessageContents() {
34 return observer_->GetTitleOfDisplayErrorNotificationForTest(); 34 return observer_->GetDisplayErrorNotificationMessageForTest();
35 } 35 }
36 36
37 private: 37 private:
38 scoped_ptr<DisplayErrorObserver> observer_; 38 scoped_ptr<DisplayErrorObserver> observer_;
39 39
40 DISALLOW_COPY_AND_ASSIGN(DisplayErrorObserverTest); 40 DISALLOW_COPY_AND_ASSIGN(DisplayErrorObserverTest);
41 }; 41 };
42 42
43 TEST_F(DisplayErrorObserverTest, Normal) { 43 TEST_F(DisplayErrorObserverTest, Normal) {
44 if (!SupportsMultipleDisplays()) 44 if (!SupportsMultipleDisplays())
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 GetMessageContents()); 83 GetMessageContents());
84 84
85 observer()->OnDisplayModeChangeFailed( 85 observer()->OnDisplayModeChangeFailed(
86 ui::DisplayConfigurator::DisplayStateList(), 86 ui::DisplayConfigurator::DisplayStateList(),
87 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED); 87 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
88 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING), 88 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
89 GetMessageContents()); 89 GetMessageContents());
90 } 90 }
91 91
92 } // namespace ash 92 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698