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

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

Issue 18430004: Sets correct ActivityLog enabled status to the first renderer process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 "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"
11 #include "chrome/browser/about_flags.h" 11 #include "chrome/browser/about_flags.h"
12 #include "chrome/browser/accessibility/invert_bubble_prefs.h" 12 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
13 #include "chrome/browser/background/background_mode_manager.h" 13 #include "chrome/browser/background/background_mode_manager.h"
14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h" 14 #include "chrome/browser/bookmarks/bookmark_prompt_prefs.h"
15 #include "chrome/browser/bookmarks/bookmark_utils.h" 15 #include "chrome/browser/bookmarks/bookmark_utils.h"
16 #include "chrome/browser/browser_process_impl.h" 16 #include "chrome/browser/browser_process_impl.h"
17 #include "chrome/browser/browser_shutdown.h" 17 #include "chrome/browser/browser_shutdown.h"
18 #include "chrome/browser/chrome_content_browser_client.h" 18 #include "chrome/browser/chrome_content_browser_client.h"
19 #include "chrome/browser/component_updater/recovery_component_installer.h" 19 #include "chrome/browser/component_updater/recovery_component_installer.h"
20 #include "chrome/browser/content_settings/host_content_settings_map.h" 20 #include "chrome/browser/content_settings/host_content_settings_map.h"
21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 21 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
22 #include "chrome/browser/devtools/devtools_window.h" 22 #include "chrome/browser/devtools/devtools_window.h"
23 #include "chrome/browser/download/download_prefs.h" 23 #include "chrome/browser/download/download_prefs.h"
24 #include "chrome/browser/extensions/activity_log/activity_log.h"
24 #include "chrome/browser/extensions/api/commands/command_service.h" 25 #include "chrome/browser/extensions/api/commands/command_service.h"
25 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 26 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
26 #include "chrome/browser/extensions/extension_prefs.h" 27 #include "chrome/browser/extensions/extension_prefs.h"
27 #include "chrome/browser/extensions/extension_web_ui.h" 28 #include "chrome/browser/extensions/extension_web_ui.h"
28 #include "chrome/browser/external_protocol/external_protocol_handler.h" 29 #include "chrome/browser/external_protocol/external_protocol_handler.h"
29 #include "chrome/browser/first_run/first_run.h" 30 #include "chrome/browser/first_run/first_run.h"
30 #include "chrome/browser/geolocation/geolocation_prefs.h" 31 #include "chrome/browser/geolocation/geolocation_prefs.h"
31 #include "chrome/browser/google/google_url_tracker.h" 32 #include "chrome/browser/google/google_url_tracker.h"
32 #include "chrome/browser/google/google_url_tracker_factory.h" 33 #include "chrome/browser/google/google_url_tracker_factory.h"
33 #include "chrome/browser/gpu/gl_string_manager.h" 34 #include "chrome/browser/gpu/gl_string_manager.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 311 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
311 PrefsTabHelper::RegisterProfilePrefs(registry); 312 PrefsTabHelper::RegisterProfilePrefs(registry);
312 Profile::RegisterProfilePrefs(registry); 313 Profile::RegisterProfilePrefs(registry);
313 ProfileImpl::RegisterProfilePrefs(registry); 314 ProfileImpl::RegisterProfilePrefs(registry);
314 PromoResourceService::RegisterProfilePrefs(registry); 315 PromoResourceService::RegisterProfilePrefs(registry);
315 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 316 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
316 RegisterBrowserUserPrefs(registry); 317 RegisterBrowserUserPrefs(registry);
317 SessionStartupPref::RegisterProfilePrefs(registry); 318 SessionStartupPref::RegisterProfilePrefs(registry);
318 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 319 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
319 TranslatePrefs::RegisterProfilePrefs(registry); 320 TranslatePrefs::RegisterProfilePrefs(registry);
321 extensions::ActivityLog::RegisterProfilePrefs(registry);
320 322
321 #if defined(ENABLE_CONFIGURATION_POLICY) 323 #if defined(ENABLE_CONFIGURATION_POLICY)
322 policy::URLBlacklistManager::RegisterProfilePrefs(registry); 324 policy::URLBlacklistManager::RegisterProfilePrefs(registry);
323 #endif 325 #endif
324 326
325 #if defined(ENABLE_MANAGED_USERS) 327 #if defined(ENABLE_MANAGED_USERS)
326 ManagedUserService::RegisterProfilePrefs(registry); 328 ManagedUserService::RegisterProfilePrefs(registry);
327 ManagedUserRegistrationService::RegisterProfilePrefs(registry); 329 ManagedUserRegistrationService::RegisterProfilePrefs(registry);
328 #endif 330 #endif
329 331
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 } 490 }
489 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 491 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
490 492
491 current_version |= GOOGLE_URL_TRACKER_PREFS; 493 current_version |= GOOGLE_URL_TRACKER_PREFS;
492 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 494 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
493 current_version); 495 current_version);
494 } 496 }
495 } 497 }
496 498
497 } // namespace chrome 499 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698