ash/display/display_error_observer_chromeos_unittest.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 »

OLD	NEW
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 Loading...
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

OLD	NEW