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

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

Issue 2047683002: Store Origin Trials public key in browser prefs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; update SetupOriginTrials method name Created 4 years, 6 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 <string> 7 #include <string>
8 8
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/net/http_server_properties_manager_factory.h" 34 #include "chrome/browser/net/http_server_properties_manager_factory.h"
35 #include "chrome/browser/net/net_pref_observer.h" 35 #include "chrome/browser/net/net_pref_observer.h"
36 #include "chrome/browser/net/prediction_options.h" 36 #include "chrome/browser/net/prediction_options.h"
37 #include "chrome/browser/net/predictor.h" 37 #include "chrome/browser/net/predictor.h"
38 #include "chrome/browser/notifications/extension_welcome_notification.h" 38 #include "chrome/browser/notifications/extension_welcome_notification.h"
39 #include "chrome/browser/notifications/notifier_state_tracker.h" 39 #include "chrome/browser/notifications/notifier_state_tracker.h"
40 #include "chrome/browser/pepper_flash_settings_manager.h" 40 #include "chrome/browser/pepper_flash_settings_manager.h"
41 #include "chrome/browser/plugins/plugin_finder.h" 41 #include "chrome/browser/plugins/plugin_finder.h"
42 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 42 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
43 #include "chrome/browser/prefs/incognito_mode_prefs.h" 43 #include "chrome/browser/prefs/incognito_mode_prefs.h"
44 #include "chrome/browser/prefs/origin_trial_prefs.h"
44 #include "chrome/browser/prefs/session_startup_pref.h" 45 #include "chrome/browser/prefs/session_startup_pref.h"
45 #include "chrome/browser/profiles/chrome_version_service.h" 46 #include "chrome/browser/profiles/chrome_version_service.h"
46 #include "chrome/browser/profiles/profile.h" 47 #include "chrome/browser/profiles/profile.h"
47 #include "chrome/browser/profiles/profile_impl.h" 48 #include "chrome/browser/profiles/profile_impl.h"
48 #include "chrome/browser/profiles/profile_info_cache.h" 49 #include "chrome/browser/profiles/profile_info_cache.h"
49 #include "chrome/browser/profiles/profiles_state.h" 50 #include "chrome/browser/profiles/profiles_state.h"
50 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" 51 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
51 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" 52 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"
52 #include "chrome/browser/search/search.h" 53 #include "chrome/browser/search/search.h"
53 #include "chrome/browser/signin/signin_manager_factory.h" 54 #include "chrome/browser/signin/signin_manager_factory.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 component_updater::RegisterPrefsForRecoveryComponent(registry); 309 component_updater::RegisterPrefsForRecoveryComponent(registry);
309 component_updater::SupervisedUserWhitelistInstaller::RegisterPrefs(registry); 310 component_updater::SupervisedUserWhitelistInstaller::RegisterPrefs(registry);
310 ExternalProtocolHandler::RegisterPrefs(registry); 311 ExternalProtocolHandler::RegisterPrefs(registry);
311 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); 312 flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry);
312 geolocation::RegisterPrefs(registry); 313 geolocation::RegisterPrefs(registry);
313 GLStringManager::RegisterPrefs(registry); 314 GLStringManager::RegisterPrefs(registry);
314 GpuModeManager::RegisterPrefs(registry); 315 GpuModeManager::RegisterPrefs(registry);
315 IntranetRedirectDetector::RegisterPrefs(registry); 316 IntranetRedirectDetector::RegisterPrefs(registry);
316 IOThread::RegisterPrefs(registry); 317 IOThread::RegisterPrefs(registry);
317 network_time::NetworkTimeTracker::RegisterPrefs(registry); 318 network_time::NetworkTimeTracker::RegisterPrefs(registry);
319 OriginTrialPrefs::RegisterPrefs(registry);
318 PrefProxyConfigTrackerImpl::RegisterPrefs(registry); 320 PrefProxyConfigTrackerImpl::RegisterPrefs(registry);
319 ProfileInfoCache::RegisterPrefs(registry); 321 ProfileInfoCache::RegisterPrefs(registry);
320 profiles::RegisterPrefs(registry); 322 profiles::RegisterPrefs(registry);
321 rappor::RapporService::RegisterPrefs(registry); 323 rappor::RapporService::RegisterPrefs(registry);
322 RegisterScreenshotPrefs(registry); 324 RegisterScreenshotPrefs(registry);
323 SigninManagerFactory::RegisterPrefs(registry); 325 SigninManagerFactory::RegisterPrefs(registry);
324 ssl_config::SSLConfigServiceManager::RegisterPrefs(registry); 326 ssl_config::SSLConfigServiceManager::RegisterPrefs(registry);
325 startup_metric_utils::RegisterPrefs(registry); 327 startup_metric_utils::RegisterPrefs(registry);
326 update_client::RegisterPrefs(registry); 328 update_client::RegisterPrefs(registry);
327 web_resource::PromoResourceService::RegisterPrefs(registry); 329 web_resource::PromoResourceService::RegisterPrefs(registry);
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, 703 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined,
702 install_time.ToInternalValue()); 704 install_time.ToInternalValue());
703 } 705 }
704 profile_prefs->ClearPref(kCheckDefaultBrowser); 706 profile_prefs->ClearPref(kCheckDefaultBrowser);
705 707
706 // Added 5/2016. 708 // Added 5/2016.
707 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); 709 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref);
708 } 710 }
709 711
710 } // namespace chrome 712 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/origin_trials_component_installer.cc ('k') | chrome/browser/prefs/origin_trial_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698