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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | ash/display/display_info.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 namespace internal {
18 17
19 class DisplayErrorObserverTest : public test::AshTestBase { 18 class DisplayErrorObserverTest : public test::AshTestBase {
20 protected: 19 protected:
21 DisplayErrorObserverTest() { 20 DisplayErrorObserverTest() {
22 } 21 }
23 22
24 virtual ~DisplayErrorObserverTest() { 23 virtual ~DisplayErrorObserverTest() {
25 } 24 }
26 25
27 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() OVERRIDE {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 UpdateDisplay("200x200,300x300"); 73 UpdateDisplay("200x200,300x300");
75 observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR); 74 observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_MIRROR);
76 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING), 75 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),
77 GetMessageContents()); 76 GetMessageContents());
78 77
79 observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_EXTENDED); 78 observer()->OnDisplayModeChangeFailed(ui::OUTPUT_STATE_DUAL_EXTENDED);
80 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING), 79 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
81 GetMessageContents()); 80 GetMessageContents());
82 } 81 }
83 82
84 } // namespace internal
85 } // namespace ash 83 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | ash/display/display_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698