Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(197)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 386283002: Move bookmark_utils into bookmarks namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/browser_prefs.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 #if defined(TOOLKIT_VIEWS) 342 #if defined(TOOLKIT_VIEWS)
343 RegisterBrowserViewLocalPrefs(registry); 343 RegisterBrowserViewLocalPrefs(registry);
344 #endif 344 #endif
345 } 345 }
346 346
347 // Register prefs applicable to all profiles. 347 // Register prefs applicable to all profiles.
348 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 348 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
349 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs"); 349 TRACE_EVENT0("browser", "chrome::RegisterUserPrefs");
350 // User prefs. Please keep this list alphabetized. 350 // User prefs. Please keep this list alphabetized.
351 autofill::AutofillManager::RegisterProfilePrefs(registry); 351 autofill::AutofillManager::RegisterProfilePrefs(registry);
352 bookmark_utils::RegisterProfilePrefs(registry); 352 bookmarks::RegisterProfilePrefs(registry);
353 sync_driver::SyncPrefs::RegisterProfilePrefs(registry); 353 sync_driver::SyncPrefs::RegisterProfilePrefs(registry);
354 ChromeContentBrowserClient::RegisterProfilePrefs(registry); 354 ChromeContentBrowserClient::RegisterProfilePrefs(registry);
355 ChromeVersionService::RegisterProfilePrefs(registry); 355 ChromeVersionService::RegisterProfilePrefs(registry);
356 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs( 356 chrome_browser_net::HttpServerPropertiesManagerFactory::RegisterProfilePrefs(
357 registry); 357 registry);
358 chrome_browser_net::Predictor::RegisterProfilePrefs(registry); 358 chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
359 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry); 359 chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry);
360 chrome_prefs::RegisterProfilePrefs(registry); 360 chrome_prefs::RegisterProfilePrefs(registry);
361 DownloadPrefs::RegisterProfilePrefs(registry); 361 DownloadPrefs::RegisterProfilePrefs(registry);
362 easy_unlock::RegisterProfilePrefs(registry); 362 easy_unlock::RegisterProfilePrefs(registry);
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 #if defined(OS_CHROMEOS) 591 #if defined(OS_CHROMEOS)
592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 592 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
593 #endif 593 #endif
594 594
595 #if defined(TOOLKIT_VIEWS) 595 #if defined(TOOLKIT_VIEWS)
596 MigrateBrowserTabStripPrefs(local_state); 596 MigrateBrowserTabStripPrefs(local_state);
597 #endif 597 #endif
598 } 598 }
599 599
600 } // namespace chrome 600 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698