Splits shelf alignment and auto-hide behavior into two values, one

chrome/browser/ui/ash/chrome_launcher_prefs.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/ash/chrome_launcher_prefs.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 35 matching lines @@
   // pushed to local state and we'll need to track profile per item.
   user_prefs->RegisterBooleanPref(prefs::kUseDefaultPinnedApps,
                                   true,
                                   PrefService::SYNCABLE_PREF);
   user_prefs->RegisterListPref(prefs::kPinnedLauncherApps,
                                CreateDefaultPinnedAppsList(),
                                PrefService::SYNCABLE_PREF);
   user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehavior,
                                  kShelfAutoHideBehaviorNever,
                                  PrefService::SYNCABLE_PREF);
+  user_prefs->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,
+                                 std::string(),
+                                 PrefService::UNSYNCABLE_PREF);
   user_prefs->RegisterStringPref(prefs::kShelfAlignment,
                                  kShelfAlignmentBottom,
                                  PrefService::SYNCABLE_PREF);
+  user_prefs->RegisterStringPref(prefs::kShelfAlignmentLocal,
+                                 std::string(),
+                                 PrefService::UNSYNCABLE_PREF);
   user_prefs->RegisterBooleanPref(prefs::kLauncherShouldRunSyncAnimation,
                                   true,
                                   PrefService::UNSYNCABLE_PREF);
 }
 
 base::DictionaryValue* CreateAppDict(const std::string& app_id) {
   scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);
   app_value->SetString(kPinnedAppsPrefAppIDPath, app_id);
   return app_value.release();
 }
 
 }  // namespace ash