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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/chromeos/tray_display_unittest.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display_unittest.cc
diff --git a/ash/system/chromeos/tray_display_unittest.cc b/ash/system/chromeos/tray_display_unittest.cc
index 374d9d3992720f963fe4b05aa3ccd45246d79fe2..60cbb0b578ff71983068fc591de3e8e2dd0dcd2c 100644
--- a/ash/system/chromeos/tray_display_unittest.cc
+++ b/ash/system/chromeos/tray_display_unittest.cc
@@ -37,14 +37,14 @@ base::string16 GetTooltipText(const base::string16& headline,
if (data1.empty()) {
lines.push_back(name1);
} else {
- lines.push_back(l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
- name1, base::UTF8ToUTF16(data1)));
+ lines.push_back(
+ l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
+ name1, base::UTF8ToUTF16(data1)));
}
if (!name2.empty()) {
- lines.push_back(l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
- name2, base::UTF8ToUTF16(data2)));
+ lines.push_back(
+ l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
+ name2, base::UTF8ToUTF16(data2)));
}
return base::JoinString(lines, base::ASCIIToUTF16("\n"));
}
@@ -105,11 +105,9 @@ class TrayDisplayTest : public ash::test::AshTestBase {
DISALLOW_COPY_AND_ASSIGN(TrayDisplayTest);
};
-TrayDisplayTest::TrayDisplayTest() : tray_(NULL), tray_display_(NULL) {
-}
+TrayDisplayTest::TrayDisplayTest() : tray_(NULL), tray_display_(NULL) {}
-TrayDisplayTest::~TrayDisplayTest() {
-}
+TrayDisplayTest::~TrayDisplayTest() {}
void TrayDisplayTest::SetUp() {
ash::test::AshTestBase::SetUp();
@@ -144,9 +142,8 @@ void TrayDisplayTest::CloseNotification() {
}
bool TrayDisplayTest::IsDisplayVisibleInTray() const {
- return tray_->HasSystemBubble() &&
- tray_display_->default_view() &&
- tray_display_->default_view()->visible();
+ return tray_->HasSystemBubble() && tray_display_->default_view() &&
+ tray_display_->default_view()->visible();
}
base::string16 TrayDisplayTest::GetTrayDisplayText() const {
@@ -186,7 +183,8 @@ const message_center::Notification* TrayDisplayTest::GetDisplayNotification()
const message_center::NotificationList::Notifications notifications =
message_center::MessageCenter::Get()->GetVisibleNotifications();
for (message_center::NotificationList::Notifications::const_iterator iter =
- notifications.begin(); iter != notifications.end(); ++iter) {
+ notifications.begin();
+ iter != notifications.end(); ++iter) {
if ((*iter)->id() == TrayDisplay::kNotificationId)
return *iter;
}
@@ -267,8 +265,8 @@ TEST_F(TrayDisplayTest, InternalDisplayResized) {
GetTray()->ShowDefaultView(BUBBLE_USE_EXISTING);
EXPECT_TRUE(IsDisplayVisibleInTray());
base::string16 internal_info = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
- GetFirstDisplayName(), base::UTF8ToUTF16("600x600"));
+ IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, GetFirstDisplayName(),
+ base::UTF8ToUTF16("600x600"));
EXPECT_EQ(internal_info, GetTrayDisplayText());
EXPECT_EQ(GetTooltipText(base::string16(), GetFirstDisplayName(), "600x600",
base::string16(), std::string()),
@@ -309,10 +307,9 @@ TEST_F(TrayDisplayTest, InternalDisplayResized) {
EXPECT_TRUE(IsDisplayVisibleInTray());
expected = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
EXPECT_EQ(expected, GetTrayDisplayText());
- EXPECT_EQ(
- GetTooltipText(
- expected, GetFirstDisplayName(), "600x600", base::string16(), ""),
- GetTrayDisplayTooltipText());
+ EXPECT_EQ(GetTooltipText(expected, GetFirstDisplayName(), "600x600",
+ base::string16(), ""),
+ GetTrayDisplayTooltipText());
CheckAccessibleName();
// Unified mode
@@ -343,8 +340,7 @@ TEST_F(TrayDisplayTest, ExternalDisplayResized) {
base::string16 expected = l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
- GetSecondDisplayName(),
+ IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME, GetSecondDisplayName(),
base::UTF8ToUTF16(secondary_display.size().ToString())));
EXPECT_EQ(expected, GetTrayDisplayText());
EXPECT_EQ(GetTooltipText(expected, GetFirstDisplayName(), "400x400",
@@ -379,27 +375,26 @@ TEST_F(TrayDisplayTest, OverscanDisplay) {
IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION_OVERSCAN);
base::string16 headline = l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
- l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
- GetSecondDisplayName(), base::UTF8ToUTF16("286x286")));
- std::string second_data = l10n_util::GetStringFUTF8(
- IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION,
- base::UTF8ToUTF16("286x286"), overscan);
+ l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
+ GetSecondDisplayName(),
+ base::UTF8ToUTF16("286x286")));
+ std::string second_data =
+ l10n_util::GetStringFUTF8(IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION,
+ base::UTF8ToUTF16("286x286"), overscan);
EXPECT_EQ(GetTooltipText(headline, GetFirstDisplayName(), "400x400",
GetSecondDisplayName(), second_data),
GetTrayDisplayTooltipText());
// reset the overscan.
- display_manager->SetOverscanInsets(
- ScreenUtil::GetSecondaryDisplay().id(), gfx::Insets());
+ display_manager->SetOverscanInsets(ScreenUtil::GetSecondaryDisplay().id(),
+ gfx::Insets());
headline = l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
- l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
- GetSecondDisplayName(), overscan));
- second_data = l10n_util::GetStringFUTF8(
- IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION,
- base::UTF8ToUTF16("300x300"), overscan);
+ l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATED_NAME,
+ GetSecondDisplayName(), overscan));
+ second_data =
+ l10n_util::GetStringFUTF8(IDS_ASH_STATUS_TRAY_DISPLAY_ANNOTATION,
+ base::UTF8ToUTF16("300x300"), overscan);
EXPECT_EQ(GetTooltipText(headline, GetFirstDisplayName(), "400x400",
GetSecondDisplayName(), second_data),
GetTrayDisplayTooltipText());
@@ -413,8 +408,8 @@ TEST_F(TrayDisplayTest, UpdateDuringDisplayConfigurationChange) {
EXPECT_TRUE(GetTray()->HasSystemBubble());
EXPECT_TRUE(IsDisplayVisibleInTray());
base::string16 internal_info = l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY,
- GetFirstDisplayName(), base::UTF8ToUTF16("600x600"));
+ IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, GetFirstDisplayName(),
+ base::UTF8ToUTF16("600x600"));
EXPECT_EQ(internal_info, GetTrayDisplayText());
EXPECT_EQ(GetTooltipText(base::string16(), GetFirstDisplayName(), "600x600",
base::string16(), std::string()),
@@ -496,10 +491,9 @@ TEST_F(TrayDisplayTest, DisplayNotifications) {
// Extended.
CloseNotification();
UpdateDisplay("400x400,200x200");
- EXPECT_EQ(
- l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName()),
- GetDisplayNotificationText());
+ EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
+ GetSecondDisplayName()),
+ GetDisplayNotificationText());
EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
// Mirroring.
@@ -515,10 +509,9 @@ TEST_F(TrayDisplayTest, DisplayNotifications) {
CloseNotification();
display_manager->SetSoftwareMirroring(false);
UpdateDisplay("400x400,200x200");
- EXPECT_EQ(
- l10n_util::GetStringFUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED, GetSecondDisplayName()),
- GetDisplayNotificationText());
+ EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED,
+ GetSecondDisplayName()),
+ GetDisplayNotificationText());
EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
// Resize the first display.
@@ -545,10 +538,9 @@ TEST_F(TrayDisplayTest, DisplayNotifications) {
UpdateDisplay("400x400@1.5");
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
GetDisplayNotificationText());
- EXPECT_EQ(
- ash::SubstituteChromeOSDeviceType(
- IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
- GetDisplayNotificationAdditionalText());
+ EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
+ IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
+ GetDisplayNotificationAdditionalText());
}
TEST_F(TrayDisplayTest, DisplayConfigurationChangedTwice) {
@@ -556,19 +548,17 @@ TEST_F(TrayDisplayTest, DisplayConfigurationChangedTwice) {
tray_delegate->set_should_show_display_notification(true);
UpdateDisplay("400x400,200x200");
- EXPECT_EQ(
- l10n_util::GetStringUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
- GetDisplayNotificationText());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
+ GetDisplayNotificationText());
// OnDisplayConfigurationChanged() may be called more than once for a single
// update display in case of primary is swapped or recovered from dock mode.
// Should not remove the notification in such case.
GetTrayDisplay()->OnDisplayConfigurationChanged();
- EXPECT_EQ(
- l10n_util::GetStringUTF16(
- IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
- GetDisplayNotificationText());
+ EXPECT_EQ(l10n_util::GetStringUTF16(
+ IDS_ASH_STATUS_TRAY_DISPLAY_EXTENDED_NO_INTERNAL),
+ GetDisplayNotificationText());
// Back to the single display. It SHOULD remove the notification since the
// information is stale.
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698