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

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

Issue 2742373003: Limit the amount the Location Settings Dialog will be shown to users. (Closed)
Patch Set: Feedback Created 3 years, 9 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
« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 158 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
159 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 159 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
160 #endif 160 #endif
161 161
162 #if defined(OS_ANDROID) 162 #if defined(OS_ANDROID)
163 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 163 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
164 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" 164 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h"
165 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" 165 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
166 #include "chrome/browser/android/preferences/browser_prefs_android.h" 166 #include "chrome/browser/android/preferences/browser_prefs_android.h"
167 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
167 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" 168 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
168 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " 169 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h "
169 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" 170 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
170 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" 171 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h"
171 #include "components/ntp_tiles/popular_sites_impl.h" 172 #include "components/ntp_tiles/popular_sites_impl.h"
172 #else 173 #else
173 #include "chrome/browser/gcm/gcm_product_util.h" 174 #include "chrome/browser/gcm/gcm_product_util.h"
174 #include "chrome/browser/signin/signin_promo.h" 175 #include "chrome/browser/signin/signin_promo.h"
175 #include "chrome/browser/ui/startup/startup_browser_creator.h" 176 #include "chrome/browser/ui/startup/startup_browser_creator.h"
176 #include "chrome/browser/ui/webui/foreign_session_handler.h" 177 #include "chrome/browser/ui/webui/foreign_session_handler.h"
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 SupervisedUserSyncService::RegisterProfilePrefs(registry); 545 SupervisedUserSyncService::RegisterProfilePrefs(registry);
545 #endif 546 #endif
546 ChildAccountService::RegisterProfilePrefs(registry); 547 ChildAccountService::RegisterProfilePrefs(registry);
547 SupervisedUserService::RegisterProfilePrefs(registry); 548 SupervisedUserService::RegisterProfilePrefs(registry);
548 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); 549 SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
549 #endif 550 #endif
550 551
551 #if defined(OS_ANDROID) 552 #if defined(OS_ANDROID)
552 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry); 553 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry);
553 variations::VariationsService::RegisterProfilePrefs(registry); 554 variations::VariationsService::RegisterProfilePrefs(registry);
555 GeolocationPermissionContextAndroid::RegisterProfilePrefs(registry);
554 PartnerBookmarksShim::RegisterProfilePrefs(registry); 556 PartnerBookmarksShim::RegisterProfilePrefs(registry);
555 RecentTabsPagePrefs::RegisterProfilePrefs(registry); 557 RecentTabsPagePrefs::RegisterProfilePrefs(registry);
556 #else 558 #else
557 AppShortcutManager::RegisterProfilePrefs(registry); 559 AppShortcutManager::RegisterProfilePrefs(registry);
558 DeviceIDFetcher::RegisterProfilePrefs(registry); 560 DeviceIDFetcher::RegisterProfilePrefs(registry);
559 DevToolsWindow::RegisterProfilePrefs(registry); 561 DevToolsWindow::RegisterProfilePrefs(registry);
560 #if BUILDFLAG(ENABLE_APP_LIST) 562 #if BUILDFLAG(ENABLE_APP_LIST)
561 DriveAppMapping::RegisterProfilePrefs(registry); 563 DriveAppMapping::RegisterProfilePrefs(registry);
562 app_list::AppListSyncableService::RegisterProfilePrefs(registry); 564 app_list::AppListSyncableService::RegisterProfilePrefs(registry);
563 #endif 565 #endif
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 if (distro_dict && 785 if (distro_dict &&
784 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { 786 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) {
785 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); 787 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
786 } 788 }
787 #endif // BUILDFLAG(ENABLE_RLZ) 789 #endif // BUILDFLAG(ENABLE_RLZ)
788 profile_prefs->ClearPref(kDistroDict); 790 profile_prefs->ClearPref(kDistroDict);
789 } 791 }
790 } 792 }
791 793
792 } // namespace chrome 794 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698