Move kAssociatedNetworkFontStyle out of browser_defaults
defaults.h defines various defaults whose values varies depending upon
the OS. kAssociatedNetworkFontStyle is only used in one file, on
ChromeOS, so doesn't belong.
(It was added in r89427 when there was a TOUCH_UI #ifdef, but that's
gone now).
BUG=None
Review URL: https://codereview.chromium.org/1379523002
Cr-Commit-Position: refs/heads/master@{#351432}
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index c046f82..61193ce 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -45,6 +45,7 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
#include "extensions/common/constants.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_WIN)
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index df60ba5..acb574a8 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -42,6 +42,9 @@
const int kMainIndexMask = 0x1000;
const int kMoreIndexMask = 0x4000;
+const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle =
+ ui::ResourceBundle::BoldFont;
+
// Replace '&' in a string with "&&" to allow it to be a menu item label.
std::string EscapeAmpersands(const std::string& input) {
std::string str = input;
@@ -249,7 +252,7 @@
const gfx::FontList* font_list = NULL;
if (menu_items_[index].flags & FLAG_ASSOCIATED) {
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
- font_list = &rb->GetFontList(browser_defaults::kAssociatedNetworkFontStyle);
+ font_list = &rb->GetFontList(kAssociatedNetworkFontStyle);
}
return font_list;
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index b742060..35cd53f 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -51,9 +51,6 @@
const bool kScrollEventChangesTab = false;
#endif
-const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle =
- ui::ResourceBundle::BoldFont;
-
#if !defined(OS_ANDROID)
const bool kPasswordEchoEnabled = false;
#endif
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 482f7c6..6d93b7c 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -8,8 +8,6 @@
#define CHROME_BROWSER_DEFAULTS_H_
#include "build/build_config.h"
-#include "chrome/browser/prefs/session_startup_pref.h"
-#include "ui/base/resource/resource_bundle.h"
namespace browser_defaults {
@@ -53,9 +51,6 @@
// Should scroll events on the tabstrip change tabs?
extern const bool kScrollEventChangesTab;
-// ChromiumOS network menu font
-extern const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle;
-
// Last character display for passwords.
extern const bool kPasswordEchoEnabled;
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 44d726d..ee25cc55 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -13,6 +13,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/first_run/first_run.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sessions/session_restore.h"
diff --git a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc
index 8cc59ccc..6209c432 100644
--- a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc
+++ b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/defaults.h"
+#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index a343bdb..1853c5b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -86,6 +86,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
#include "ui/base/window_open_disposition.h"
#include "ui/keyboard/keyboard_util.h"
#include "ui/resources/grit/ui_resources.h"
