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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 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
« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | ash/display/display_util.cc » ('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/common/system/chromeos/devicetype_utils.h"
8 #include "ash/display/display_util.h" 7 #include "ash/display/display_util.h"
9 #include "ash/shell.h" 8 #include "ash/shell.h"
10 #include "ash/strings/grit/ash_strings.h" 9 #include "ash/strings/grit/ash_strings.h"
10 #include "ash/system/devicetype_utils.h"
11 #include "ash/test/ash_test_base.h" 11 #include "ash/test/ash_test_base.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 #include "ui/base/l10n/l10n_util.h" 13 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/views/controls/label.h" 14 #include "ui/views/controls/label.h"
15 #include "ui/views/view.h" 15 #include "ui/views/view.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class DisplayErrorObserverTest : public test::AshTestBase { 20 class DisplayErrorObserverTest : public test::AshTestBase {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 observer()->OnDisplayModeChangeFailed( 77 observer()->OnDisplayModeChangeFailed(
78 display::DisplayConfigurator::DisplayStateList(), 78 display::DisplayConfigurator::DisplayStateList(),
79 display::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED); 79 display::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
80 EXPECT_EQ(ash::SubstituteChromeOSDeviceType( 80 EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
81 IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING), 81 IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),
82 GetMessageContents()); 82 GetMessageContents());
83 } 83 }
84 84
85 } // namespace ash 85 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698