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

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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
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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 82 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
83 #include "chrome/browser/ui/webui/flags_ui.h" 83 #include "chrome/browser/ui/webui/flags_ui.h"
84 #include "chrome/browser/ui/webui/instant_ui.h" 84 #include "chrome/browser/ui/webui/instant_ui.h"
85 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 85 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
86 #include "chrome/browser/ui/webui/plugins_ui.h" 86 #include "chrome/browser/ui/webui/plugins_ui.h"
87 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" 87 #include "chrome/browser/ui/webui/print_preview/sticky_settings.h"
88 #include "chrome/browser/upgrade_detector.h" 88 #include "chrome/browser/upgrade_detector.h"
89 #include "chrome/browser/web_resource/promo_resource_service.h" 89 #include "chrome/browser/web_resource/promo_resource_service.h"
90 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
91 #include "components/autofill/core/browser/autofill_manager.h" 91 #include "components/autofill/core/browser/autofill_manager.h"
92 #include "components/bookmarks/core/browser/bookmark_utils.h" 92 #include "components/bookmarks/browser/bookmark_utils.h"
93 #include "components/password_manager/core/browser/password_manager.h" 93 #include "components/password_manager/core/browser/password_manager.h"
94 #include "components/pref_registry/pref_registry_syncable.h" 94 #include "components/pref_registry/pref_registry_syncable.h"
95 #include "components/rappor/rappor_service.h" 95 #include "components/rappor/rappor_service.h"
96 #include "components/sync_driver/sync_prefs.h" 96 #include "components/sync_driver/sync_prefs.h"
97 #include "components/translate/core/browser/translate_prefs.h" 97 #include "components/translate/core/browser/translate_prefs.h"
98 #include "content/public/browser/render_process_host.h" 98 #include "content/public/browser/render_process_host.h"
99 #include "extensions/browser/extension_prefs.h" 99 #include "extensions/browser/extension_prefs.h"
100 100
101 #if defined(ENABLE_AUTOFILL_DIALOG) 101 #if defined(ENABLE_AUTOFILL_DIALOG)
102 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" 102 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 571 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
572 current_version); 572 current_version);
573 } 573 }
574 574
575 #if defined(OS_CHROMEOS) 575 #if defined(OS_CHROMEOS)
576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 576 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
577 #endif 577 #endif
578 } 578 }
579 579
580 } // namespace chrome 580 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/importer/profile_writer_unittest.cc ('k') | chrome/browser/profiles/bookmark_model_loaded_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698