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

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: ChromeOS fix Created 7 years, 4 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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry); 319 PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
319 PrefsTabHelper::RegisterProfilePrefs(registry); 320 PrefsTabHelper::RegisterProfilePrefs(registry);
320 Profile::RegisterProfilePrefs(registry); 321 Profile::RegisterProfilePrefs(registry);
321 ProfileImpl::RegisterProfilePrefs(registry); 322 ProfileImpl::RegisterProfilePrefs(registry);
322 PromoResourceService::RegisterProfilePrefs(registry); 323 PromoResourceService::RegisterProfilePrefs(registry);
323 ProtocolHandlerRegistry::RegisterProfilePrefs(registry); 324 ProtocolHandlerRegistry::RegisterProfilePrefs(registry);
324 RegisterBrowserUserPrefs(registry); 325 RegisterBrowserUserPrefs(registry);
325 SessionStartupPref::RegisterProfilePrefs(registry); 326 SessionStartupPref::RegisterProfilePrefs(registry);
326 TemplateURLPrepopulateData::RegisterProfilePrefs(registry); 327 TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
327 TranslatePrefs::RegisterProfilePrefs(registry); 328 TranslatePrefs::RegisterProfilePrefs(registry);
329 extensions::ActivityLog::RegisterProfilePrefs(registry);
328 330
329 #if defined(ENABLE_AUTOFILL_DIALOG) 331 #if defined(ENABLE_AUTOFILL_DIALOG)
330 autofill::AutofillDialogController::RegisterProfilePrefs(registry); 332 autofill::AutofillDialogController::RegisterProfilePrefs(registry);
331 #endif 333 #endif
332 334
333 #if defined(ENABLE_CONFIGURATION_POLICY) 335 #if defined(ENABLE_CONFIGURATION_POLICY)
334 policy::URLBlacklistManager::RegisterProfilePrefs(registry); 336 policy::URLBlacklistManager::RegisterProfilePrefs(registry);
335 #endif 337 #endif
336 338
337 #if defined(ENABLE_MANAGED_USERS) 339 #if defined(ENABLE_MANAGED_USERS)
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 } 517 }
516 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 518 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
517 519
518 current_version |= GOOGLE_URL_TRACKER_PREFS; 520 current_version |= GOOGLE_URL_TRACKER_PREFS;
519 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 521 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
520 current_version); 522 current_version);
521 } 523 }
522 } 524 }
523 525
524 } // namespace chrome 526 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/activity_log/activity_log_unittest.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698