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

Unified Diff: chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc

Issue 9307099: chromeos/aura: Make login screen status area font non-bold. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 10 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 | « chrome/browser/ui/views/aura/status_area_host_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc b/chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc
index e3a2c8efd8d68602339b04f85488eb00911adb84..30f7d7dfeb938908c62a9d257f087397c9585be9 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc
+++ b/chrome/browser/ui/views/aura/status_area_host_aura_browsertest.cc
@@ -31,7 +31,7 @@ IN_PROC_BROWSER_TEST_F(StatusAreaHostAuraTest, TextStyle) {
#if defined(OS_CHROMEOS)
ASSERT_FALSE(chromeos::UserManager::Get()->user_is_logged_in());
- EXPECT_EQ(StatusAreaButton::GRAY_PLAIN, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::GRAY_PLAIN_LIGHT, host->GetStatusAreaTextStyle());
// ProfileManager expects a profile dir to be set on Chrome OS.
CommandLine::ForCurrentProcess()->AppendSwitchNative(
@@ -41,15 +41,19 @@ IN_PROC_BROWSER_TEST_F(StatusAreaHostAuraTest, TextStyle) {
#endif
if (ash::Shell::GetInstance()->IsWindowModeCompact()) {
- EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED_BOLD,
+ host->GetStatusAreaTextStyle());
Browser* incognito_browser = CreateIncognitoBrowser();
- EXPECT_EQ(StatusAreaButton::WHITE_PLAIN, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::WHITE_PLAIN_BOLD,
+ host->GetStatusAreaTextStyle());
incognito_browser->CloseWindow();
- EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::GRAY_EMBOSSED_BOLD,
+ host->GetStatusAreaTextStyle());
} else {
- EXPECT_EQ(StatusAreaButton::WHITE_HALOED, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::WHITE_HALOED_BOLD,
+ host->GetStatusAreaTextStyle());
}
#if defined(OS_CHROMEOS)
@@ -64,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(StatusAreaHostAuraTest, TextStyle) {
if (!tester->IsLocked())
lock_state_observer.Wait();
ASSERT_TRUE(tester->IsLocked());
- EXPECT_EQ(StatusAreaButton::GRAY_PLAIN, host->GetStatusAreaTextStyle());
+ EXPECT_EQ(StatusAreaButton::GRAY_PLAIN_LIGHT, host->GetStatusAreaTextStyle());
chromeos::ScreenLocker::Hide();
ui_test_utils::RunAllPendingInMessageLoop();
« no previous file with comments | « chrome/browser/ui/views/aura/status_area_host_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698