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

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 7044121: Use large bold font for associated network on touch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change constant name to end in ...Style. Created 9 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 | « no previous file | chrome/browser/defaults.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 72a171696fa55b9f2845e9ab19f34fbc855a1944..b5242ddd98b3b1bdecbe42867aabdbd06297e0a4 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/customization_document.h"
#include "chrome/browser/chromeos/sim_dialog_delegate.h"
+#include "chrome/browser/defaults.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/window.h"
@@ -430,9 +431,14 @@ string16 NetworkMenuModel::GetLabelAt(int index) const {
}
const gfx::Font* NetworkMenuModel::GetLabelFontAt(int index) const {
- return (menu_items_[index].flags & FLAG_ASSOCIATED) ?
- &ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BoldFont) :
- NULL;
+ const gfx::Font* font = NULL;
+ if (menu_items_[index].flags & FLAG_ASSOCIATED) {
+ ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
+ font = &resource_bundle.GetFont(
+ browser_defaults::kAssociatedNetworkFontStyle);
+ }
+
+ return font;
}
bool NetworkMenuModel::IsItemCheckedAt(int index) const {
« no previous file with comments | « no previous file | chrome/browser/defaults.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698