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

chrome/browser/prefs/browser_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/prefs/browser_prefs.h"
 
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/background/background_mode_manager.h"
@@ skipping 84 matching lines @@
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 #include "chrome/browser/policy/auto_enrollment_client.h"
 #include "chrome/browser/policy/device_status_collector.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
 #if defined(USE_ASH)
-#include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
+#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
 namespace browser {
 
 void RegisterLocalState(PrefService* local_state) {
   // Prefs in Local State
   local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
 
   AppsPromo::RegisterPrefs(local_state);
   browser_shutdown::RegisterPrefs(local_state);
@@ skipping 92 matching lines @@
   policy::URLBlacklistManager::RegisterPrefs(user_prefs);
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   browser::RegisterInvertBubbleUserPrefs(user_prefs);
 #elif defined(TOOLKIT_GTK)
   BrowserWindowGtk::RegisterUserPrefs(user_prefs);
 #endif
 
 #if defined(USE_ASH)
-  ChromeLauncherController::RegisterUserPrefs(user_prefs);
+  ash::RegisterChromeLauncherUserPrefs(user_prefs);
 #endif
 
 #if !defined(OS_ANDROID)
   Browser::RegisterUserPrefs(user_prefs);
   browser::RegisterAutolaunchPrefs(user_prefs);
   DevToolsWindow::RegisterUserPrefs(user_prefs);
   PinnedTabCodec::RegisterUserPrefs(user_prefs);
   PluginsUI::RegisterUserPrefs(user_prefs);
   PromoResourceService::RegisterUserPrefs(user_prefs);
   SyncPromoUI::RegisterUserPrefs(user_prefs);
@@ skipping 79 matching lines @@
     }
     local_state->ClearPref(prefs::kLastPromptedGoogleURL);
 
     current_version |= GOOGLE_URL_TRACKER_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version);
   }
 }
 
 }  // namespace browser