Second batch of fixing prefs registrations.

chrome/browser/ui/views/browser_actions_container.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 29 matching lines @@
 
 namespace {
 
 // Horizontal spacing between most items in the container, as well as after the
 // last item or chevron (if visible).
 const int kItemSpacing = ToolbarView::kStandardSpacing;
 
 // Horizontal spacing before the chevron (if visible).
 const int kChevronSpacing = kItemSpacing - 2;
 
-void RegisterUserPrefs(PrefRegistrySyncable* registry) {
-  registry->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
-                                0,
-                                PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-
 }  // namespace
 
 // static
 bool BrowserActionsContainer::disable_animations_during_testing_ = false;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionsContainer
 
+// static
+void BrowserActionsContainer::RegisterUserPrefs(
+    PrefRegistrySyncable* registry) {
+  registry->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
+                                0,
+                                PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
 BrowserActionsContainer::BrowserActionsContainer(Browser* browser,
                                                  View* owner_view)
     : profile_(browser->profile()),
       browser_(browser),
       owner_view_(owner_view),
       popup_(NULL),
       popup_button_(NULL),
       model_(NULL),
       container_width_(0),
       chevron_(NULL),
@@ skipping 38 matching lines @@
   StopShowFolderDropMenuTimer();
   if (popup_)
     popup_->GetWidget()->RemoveObserver(this);
   HidePopup();
   DeleteBrowserActionViews();
 }
 
 void BrowserActionsContainer::Init() {
   LoadImages();
 
-  // TODO(joi): Switch to official way of registering user prefs for
-  // this class, i.e. in a function called from
-  // browser_prefs::RegisterUserPrefs.
-  if (!profile_->GetPrefs()->FindPreference(
-          prefs::kBrowserActionContainerWidth))
-    RegisterUserPrefs(static_cast<PrefRegistrySyncable*>(
-        profile_->GetPrefs()->DeprecatedGetPrefRegistry()));
-
   // 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)) {
     // 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);
     if (predefined_width != 0)
       model_->SetVisibleIconCount(WidthToIconCount(predefined_width));
@@ skipping 714 matching lines @@
       views::BubbleBorder::TOP_LEFT : views::BubbleBorder::TOP_RIGHT;
   popup_ = ExtensionPopup::ShowPopup(popup_url,
                                      browser_,
                                      reference_view,
                                      arrow_location,
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
   popup_button_ = button;
   popup_button_->SetButtonPushed();
 }