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)); |
} |