Add Now setting and migration logic.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 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 <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 182 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/reset_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chromeos/audio/audio_devices_pref_handler_impl.h"
 #include "chromeos/timezone/timezone_resolver.h"
 #include "components/invalidation/invalidator_storage.h"
 #else
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
+#if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
+#include "chrome/browser/ui/app_list/google_now_extension.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h"
 #include "chrome/browser/ui/cocoa/confirm_quit.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
 #endif
 
@@ skipping 355 matching lines @@
   // M38.
   chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs);
 #endif
 
   PromoResourceService::MigrateUserPrefs(prefs);
   translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   autofill::AutofillManager::MigrateUserPrefs(prefs);
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
+#if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)
+  MigrateGoogleNowPrefs(profile);
+#endif
 }
 
 void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
   // or remove them from local_state outright, if copying is not required.
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
   PrefRegistrySimple* registry = static_cast<PrefRegistrySimple*>(
       local_state->DeprecatedGetPrefRegistry());
 
@@ skipping 86 matching lines @@
       host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);
 
   // We're done migrating the profile per-host zoom level values, so we clear
   // them all.
   DictionaryPrefUpdate host_zoom_dictionary_update(
       prefs, prefs::kPerHostZoomLevelsDeprecated);
   host_zoom_dictionary_update->Clear();
 }
 
 }  // namespace chrome