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

Unified Diff: chrome/browser/ui/views/aura/status_area_host_aura.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
Index: chrome/browser/ui/views/aura/status_area_host_aura.cc
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.cc b/chrome/browser/ui/views/aura/status_area_host_aura.cc
index c9c247d6acf1e23e7cd8cd800bc02d6e460d8ef5..b9e398201a8c66faebf7c4794386bda116cf0b60 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura.cc
+++ b/chrome/browser/ui/views/aura/status_area_host_aura.cc
@@ -184,36 +184,32 @@ void StatusAreaHostAura::ExecuteStatusAreaCommand(
#endif
}
-gfx::Font StatusAreaHostAura::GetStatusAreaFont(const gfx::Font& font) const {
- return font.DeriveFont(0, gfx::Font::BOLD);
-}
-
StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const {
#if defined(OS_CHROMEOS)
if (!chromeos::UserManager::Get()->user_is_logged_in())
- return StatusAreaButton::GRAY_PLAIN;
+ return StatusAreaButton::GRAY_PLAIN_LIGHT;
const chromeos::ScreenLocker* locker =
chromeos::ScreenLocker::default_screen_locker();
if (locker && locker->locked())
- return StatusAreaButton::GRAY_PLAIN;
+ return StatusAreaButton::GRAY_PLAIN_LIGHT;
#endif
if (ash::Shell::GetInstance()->IsWindowModeCompact()) {
Browser* browser = BrowserList::GetLastActive();
if (!browser)
- return StatusAreaButton::WHITE_HALOED;
+ return StatusAreaButton::WHITE_HALOED_BOLD;
ThemeService* theme_service =
ThemeServiceFactory::GetForProfile(browser->profile());
if (!theme_service->UsingDefaultTheme())
- return StatusAreaButton::WHITE_HALOED;
+ return StatusAreaButton::WHITE_HALOED_BOLD;
return browser->profile()->IsOffTheRecord() ?
- StatusAreaButton::WHITE_PLAIN :
- StatusAreaButton::GRAY_EMBOSSED;
+ StatusAreaButton::WHITE_PLAIN_BOLD :
+ StatusAreaButton::GRAY_EMBOSSED_BOLD;
} else {
- return StatusAreaButton::WHITE_HALOED;
+ return StatusAreaButton::WHITE_HALOED_BOLD;
}
}

Powered by Google App Engine
This is Rietveld 408576698