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

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing include for mac Created 6 years, 11 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/toolbar/browser_actions_container.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index 7827bf4fa9604ef84659e955ac9c0b608ae9181f..bc9284780dda15579c884348bf014314194744fa 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/ui/views/toolbar/browser_action_view.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/common/pref_names.h"
+#include "extensions/browser/pref_names.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
@@ -117,11 +118,12 @@ void BrowserActionsContainer::Init() {
// We wait to set the container width until now so that the chevron images
// will be loaded. The width calculation needs to know the chevron size.
if (model_ &&
- !profile_->GetPrefs()->HasPrefPath(prefs::kExtensionToolbarSize)) {
+ !profile_->GetPrefs()->HasPrefPath(
+ extensions::pref_names::kToolbarSize)) {
// Migration code to the new VisibleIconCount pref.
// TODO(mpcomplete): remove this after users are upgraded to 5.0.
- int predefined_width =
- profile_->GetPrefs()->GetInteger(prefs::kBrowserActionContainerWidth);
+ int predefined_width = profile_->GetPrefs()->GetInteger(
+ extensions::pref_names::kBrowserActionContainerWidth);
if (predefined_width != 0)
model_->SetVisibleIconCount(WidthToIconCount(predefined_width));
}

Powered by Google App Engine
This is Rietveld 408576698