browser: Handle the registration of ChromeLauncher prefs outside of views.

chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/ash/extension_utils.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 using extensions::Extension;
 
-namespace {
-
-// Values used for prefs::kShelfAutoHideBehavior.
-const char kShelfAutoHideBehaviorAlways[] = "Always";
-const char kShelfAutoHideBehaviorDefault[] = "Default";
-const char kShelfAutoHideBehaviorNever[] = "Never";
-
-// App ID of default pinned apps.
-const char* kDefaultPinnedApps[] = {
-  "pjkljhegncpnkpknbcohdijeoejaedia",  // Gmail
-  "coobgpohoikkiipiblmjeljniedjpjpf",  // Search
-  "apdfllckaahabafndbhieahigkjlhalf",  // Doc
-  "blpcfgokakmgnkcojhhkbfbldkacnbeo",  // YouTube
-};
-
-base::DictionaryValue* CreateAppDict(const std::string& app_id) {
-  scoped_ptr<base::DictionaryValue> app_value(new base::DictionaryValue);
-  app_value->SetString(ChromeLauncherController::kPinnedAppsPrefAppIDPath,
-                       app_id);
-  return app_value.release();
-}
-
-base::ListValue* CreateDefaultPinnedAppsList() {
-  scoped_ptr<base::ListValue> apps(new base::ListValue);
-  for (size_t i = 0; i < arraysize(kDefaultPinnedApps); ++i)
-    apps->Append(CreateAppDict(kDefaultPinnedApps[i]));
-
-  return apps.release();
-}
-
-}  // namespace
-
 // ChromeLauncherController::Item ----------------------------------------------
 
 ChromeLauncherController::Item::Item()
     : item_type(TYPE_TABBED_BROWSER),
       controller(NULL) {
 }
 
 ChromeLauncherController::Item::~Item() {
 }
 
 // ChromeLauncherController ----------------------------------------------------
 
 // static
-const char ChromeLauncherController::kPinnedAppsPrefAppIDPath[] = "id";
-
-// static
 ChromeLauncherController* ChromeLauncherController::instance_ = NULL;
 
 ChromeLauncherController::ChromeLauncherController(Profile* profile,
                                                    ash::LauncherModel* model)
     : model_(model),
       profile_(profile) {
   if (!profile_) {
     // Use the original profile as on chromeos we may get a temporary off the
     // record profile.
     profile_ = ProfileManager::GetDefaultProfile()->GetOriginalProfile();
@@ skipping 50 matching lines @@
   }
 
   CreateAppLaunchersFromPref();
 
   // TODO(sky): update unit test so that this test isn't necessary.
   if (ash::Shell::HasInstance()) {
     std::string behavior_value(
         profile_->GetPrefs()->GetString(prefs::kShelfAutoHideBehavior));
     ash::ShelfAutoHideBehavior behavior =
         ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT;
-    if (behavior_value == kShelfAutoHideBehaviorNever)
+    if (behavior_value == ash::kShelfAutoHideBehaviorNever)
       behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
-    else if (behavior_value == kShelfAutoHideBehaviorAlways)
+    else if (behavior_value == ash::kShelfAutoHideBehaviorAlways)
       behavior = ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
     ash::Shell::GetInstance()->SetShelfAutoHideBehavior(behavior);
   }
 }
 
-// static
-void ChromeLauncherController::RegisterUserPrefs(PrefService* user_prefs) {
-  // TODO: If we want to support multiple profiles this will likely need to be
-  // 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,
-                                 kShelfAutoHideBehaviorDefault,
-                                 PrefService::SYNCABLE_PREF);
-}
-
 ash::LauncherID ChromeLauncherController::CreateTabbedLauncherItem(
     BrowserLauncherItemController* controller,
     IncognitoState is_incognito,
     ash::LauncherItemStatus status) {
   ash::LauncherID id = model_->next_id();
   ash::LauncherItem item;
   item.type = ash::TYPE_TABBED;
   item.is_incognito = (is_incognito == STATE_INCOGNITO);
   item.status = status;
   model_->Add(item);
@@ skipping 199 matching lines @@
       profile_->GetPrefs()->FindPreference(prefs::kPinnedLauncherApps);
   return pref && pref->IsUserModifiable();
 }
 
 void ChromeLauncherController::SetAutoHideBehavior(
     ash::ShelfAutoHideBehavior behavior) {
   ash::Shell::GetInstance()->SetShelfAutoHideBehavior(behavior);
   const char* value = NULL;
   switch (behavior) {
     case ash::SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT:
-      value = kShelfAutoHideBehaviorDefault;
+      value = ash::kShelfAutoHideBehaviorDefault;
       break;
     case ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS:
-      value = kShelfAutoHideBehaviorAlways;
+      value = ash::kShelfAutoHideBehaviorAlways;
       break;
     case ash::SHELF_AUTO_HIDE_BEHAVIOR_NEVER:
-      value = kShelfAutoHideBehaviorNever;
+      value = ash::kShelfAutoHideBehaviorNever;
       break;
   }
   profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehavior, value);
 }
 
 void ChromeLauncherController::CreateNewTab() {
   Browser *last_browser = browser::FindTabbedBrowser(
       GetProfileForNewWindows(), true);
 
   if (!last_browser) {
@@ skipping 180 matching lines @@
   // listener.
   pref_change_registrar_.Remove(prefs::kPinnedLauncherApps, this);
   {
     ListPrefUpdate updater(profile_->GetPrefs(), prefs::kPinnedLauncherApps);
     updater->Clear();
     for (size_t i = 0; i < model_->items().size(); ++i) {
       if (model_->items()[i].type == ash::TYPE_APP_SHORTCUT) {
         ash::LauncherID id = model_->items()[i].id;
         if (id_to_item_map_.find(id) != id_to_item_map_.end() &&
             IsPinned(id)) {
-          base::DictionaryValue* app_value = CreateAppDict(
+          base::DictionaryValue* app_value = ash::CreateAppDict(
               id_to_item_map_[id].app_id);
           if (app_value)
             updater->Append(app_value);
         }
       }
     }
   }
   pref_change_registrar_.Add(prefs::kPinnedLauncherApps, this);
 }
 
@@ skipping 38 matching lines @@
   }
 }
 
 void ChromeLauncherController::CreateAppLaunchersFromPref() {
   const base::ListValue* pinned_apps =
       profile_->GetPrefs()->GetList(prefs::kPinnedLauncherApps);
   for (size_t i = 0; i < pinned_apps->GetSize(); ++i) {
     DictionaryValue* app = NULL;
     if (pinned_apps->GetDictionary(i, &app)) {
       std::string app_id;
-      if (app->GetString(kPinnedAppsPrefAppIDPath, &app_id)) {
+      if (app->GetString(ash::kPinnedAppsPrefAppIDPath, &app_id)) {
         if (app_icon_loader_->IsValidID(app_id)) {
           CreateAppLauncherItem(NULL, app_id, ash::STATUS_CLOSED);
         } else {
           Item pending_item;
           pending_item.item_type = TYPE_APP;
           pending_item.app_id = app_id;
           pending_pinned_apps_.push_back(pending_item);
         }
       }
     }
   }
 }