ash/display/display_error_observer_chromeos_unittest.cc - Issue 2490323003: Improve monitor compatibility error, move feedback link into button

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 2490323003: Improve monitor compatibility error, move feedback link into button (Closed)

Patch Set: Rename variable |optional_field| -> |data| Created 4 years 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

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"

7 #include "ash/display/display_util.h"	8 #include "ash/display/display_util.h"

8 #include "ash/shell.h"	9 #include "ash/shell.h"

9 #include "ash/test/ash_test_base.h"	10 #include "ash/test/ash_test_base.h"

10 #include "grit/ash_strings.h"	11 #include "grit/ash_strings.h"

11 #include "ui/aura/window.h"	12 #include "ui/aura/window.h"

12 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

13 #include "ui/views/controls/label.h"	14 #include "ui/views/controls/label.h"

14 #include "ui/views/view.h"	15 #include "ui/views/view.h"

15 #include "ui/views/widget/widget.h"	16 #include "ui/views/widget/widget.h"

16	17

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 UpdateDisplay("200x200,300x300");	79 UpdateDisplay("200x200,300x300");

79 observer()->OnDisplayModeChangeFailed(	80 observer()->OnDisplayModeChangeFailed(

80 ui::DisplayConfigurator::DisplayStateList(),	81 ui::DisplayConfigurator::DisplayStateList(),

81 ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);	82 ui::MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);

82 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),	83 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_MIRRORING),

83 GetMessageContents());	84 GetMessageContents());

84	85

85 observer()->OnDisplayModeChangeFailed(	86 observer()->OnDisplayModeChangeFailed(

86 ui::DisplayConfigurator::DisplayStateList(),	87 ui::DisplayConfigurator::DisplayStateList(),

87 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);	88 ui::MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);

88 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),	89 EXPECT_EQ(ash::SubstituteChromeOSDeviceType(

	90 IDS_ASH_DISPLAY_FAILURE_ON_NON_MIRRORING),

89 GetMessageContents());	91 GetMessageContents());

90 }	92 }

91	93

92 } // namespace ash	94 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/display/display_error_observer_chromeos.cc ('k') | ash/display/display_util.h » ('j') | no next file with comments »