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

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

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/about_flags.h" 7 #include "chrome/browser/about_flags.h"
8 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 #endif 231 #endif
232 232
233 #if defined(USE_ASH) 233 #if defined(USE_ASH)
234 ash::RegisterChromeLauncherUserPrefs(user_prefs); 234 ash::RegisterChromeLauncherUserPrefs(user_prefs);
235 #endif 235 #endif
236 236
237 #if !defined(OS_ANDROID) 237 #if !defined(OS_ANDROID)
238 AppsPromo::RegisterUserPrefs(user_prefs); 238 AppsPromo::RegisterUserPrefs(user_prefs);
239 extensions::CommandService::RegisterUserPrefs(user_prefs); 239 extensions::CommandService::RegisterUserPrefs(user_prefs);
240 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 240 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
241 ExtensionPrefs::RegisterUserPrefs(user_prefs); 241 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
242 ExtensionWebUI::RegisterUserPrefs(user_prefs); 242 ExtensionWebUI::RegisterUserPrefs(user_prefs);
243 RegisterBrowserUserPrefs(user_prefs); 243 RegisterBrowserUserPrefs(user_prefs);
244 RegisterAutolaunchPrefs(user_prefs); 244 RegisterAutolaunchPrefs(user_prefs);
245 DevToolsWindow::RegisterUserPrefs(user_prefs); 245 DevToolsWindow::RegisterUserPrefs(user_prefs);
246 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 246 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
247 PinnedTabCodec::RegisterUserPrefs(user_prefs); 247 PinnedTabCodec::RegisterUserPrefs(user_prefs);
248 PluginsUI::RegisterUserPrefs(user_prefs); 248 PluginsUI::RegisterUserPrefs(user_prefs);
249 PromoResourceService::RegisterUserPrefs(user_prefs); 249 PromoResourceService::RegisterUserPrefs(user_prefs);
250 SyncPromoUI::RegisterUserPrefs(user_prefs); 250 SyncPromoUI::RegisterUserPrefs(user_prefs);
251 #endif 251 #endif
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 331
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 332 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 334 current_version);
335 } 335 }
336 } 336 }
337 337
338 } // namespace chrome 338 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.h ('k') | chrome/browser/prefs/pref_set_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698