Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // 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.
 
 #import "browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 using extensions::Extension;
 using extensions::ExtensionList;
 
 NSString* const kBrowserActionVisibilityChangedNotification =
     @"BrowserActionVisibilityChangedNotification";
 
@@ skipping 214 matching lines @@
 
 - (id)initWithBrowser:(Browser*)browser
         containerView:(BrowserActionsContainerView*)container {
   DCHECK(browser && container);
 
   if ((self = [super init])) {
     browser_ = browser;
     profile_ = browser->profile();
 
     if (!profile_->GetPrefs()->FindPreference(
         prefs::kBrowserActionContainerWidth))

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

TODO: registrations up front.

[Jói, 2013/02/07 14:52:32]

Done.

-      [BrowserActionsController registerUserPrefs:profile_->GetPrefs()];
+      [BrowserActionsController registerUserPrefs:(
+          (PrefRegistrySyncable*)
+          profile_->GetPrefs()->DeprecatedGetPrefRegistry())];
 
     observer_.reset(new ExtensionServiceObserverBridge(self, browser_));
     ExtensionService* extensionService =
         extensions::ExtensionSystem::Get(profile_)->extension_service();
     // |extensionService| can be NULL in Incognito.
     if (extensionService) {
       toolbarModel_ = extensionService->toolbar_model();
       toolbarModel_->AddObserver(observer_.get());
     }
 
@@ skipping 154 matching lines @@
   if (effect == NSViewAnimationFadeInEffect) {
     return NO;
   } else if (effect == NSViewAnimationFadeOutEffect) {
     return YES;
   }
 
   NOTREACHED();
   return YES;
 }
 
-+ (void)registerUserPrefs:(PrefServiceSyncable*)prefs {
-  prefs->RegisterDoublePref(prefs::kBrowserActionContainerWidth,
-                            0,
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
++ (void)registerUserPrefs:(PrefRegistrySyncable*)registry {
+  registry->RegisterDoublePref(prefs::kBrowserActionContainerWidth,
+                               0,
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 #pragma mark -
 #pragma mark NSMenuDelegate
 
 - (void)menuNeedsUpdate:(NSMenu*)menu {
   [menu removeAllItems];
 
   // See menu_button.h for documentation on why this is needed.
   [menu addItemWithTitle:@"" action:nil keyEquivalent:@""];
@@ skipping 413 matching lines @@
   const extensions::ExtensionList& toolbar_items =
       toolbarModel_->toolbar_items();
   if (index < toolbar_items.size()) {
     const Extension* extension = toolbar_items[index];
     return [buttons_ objectForKey:base::SysUTF8ToNSString(extension->id())];
   }
   return nil;
 }
 
 @end