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

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: 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
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 157 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
158 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 158 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
159 #endif 159 #endif
160 160
161 #if defined(OS_ANDROID) 161 #if defined(OS_ANDROID)
162 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 162 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
163 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" 163 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h"
164 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" 164 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
165 #include "chrome/browser/android/preferences/browser_prefs_android.h" 165 #include "chrome/browser/android/preferences/browser_prefs_android.h"
166 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
166 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" 167 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
167 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " 168 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h "
168 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" 169 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
169 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" 170 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h"
170 #include "components/ntp_tiles/popular_sites_impl.h" 171 #include "components/ntp_tiles/popular_sites_impl.h"
171 #else 172 #else
172 #include "chrome/browser/gcm/gcm_product_util.h" 173 #include "chrome/browser/gcm/gcm_product_util.h"
173 #include "chrome/browser/signin/signin_promo.h" 174 #include "chrome/browser/signin/signin_promo.h"
174 #include "chrome/browser/ui/startup/startup_browser_creator.h" 175 #include "chrome/browser/ui/startup/startup_browser_creator.h"
175 #include "chrome/browser/ui/webui/foreign_session_handler.h" 176 #include "chrome/browser/ui/webui/foreign_session_handler.h"
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 SupervisedUserSyncService::RegisterProfilePrefs(registry); 543 SupervisedUserSyncService::RegisterProfilePrefs(registry);
543 #endif 544 #endif
544 ChildAccountService::RegisterProfilePrefs(registry); 545 ChildAccountService::RegisterProfilePrefs(registry);
545 SupervisedUserService::RegisterProfilePrefs(registry); 546 SupervisedUserService::RegisterProfilePrefs(registry);
546 SupervisedUserWhitelistService::RegisterProfilePrefs(registry); 547 SupervisedUserWhitelistService::RegisterProfilePrefs(registry);
547 #endif 548 #endif
548 549
549 #if defined(OS_ANDROID) 550 #if defined(OS_ANDROID)
550 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry); 551 ntp_tiles::PopularSitesImpl::RegisterProfilePrefs(registry);
551 variations::VariationsService::RegisterProfilePrefs(registry); 552 variations::VariationsService::RegisterProfilePrefs(registry);
553 GeolocationPermissionContextAndroid::RegisterProfilePrefs(registry);
552 PartnerBookmarksShim::RegisterProfilePrefs(registry); 554 PartnerBookmarksShim::RegisterProfilePrefs(registry);
553 RecentTabsPagePrefs::RegisterProfilePrefs(registry); 555 RecentTabsPagePrefs::RegisterProfilePrefs(registry);
554 #else 556 #else
555 AppShortcutManager::RegisterProfilePrefs(registry); 557 AppShortcutManager::RegisterProfilePrefs(registry);
556 DeviceIDFetcher::RegisterProfilePrefs(registry); 558 DeviceIDFetcher::RegisterProfilePrefs(registry);
557 DevToolsWindow::RegisterProfilePrefs(registry); 559 DevToolsWindow::RegisterProfilePrefs(registry);
558 #if BUILDFLAG(ENABLE_APP_LIST) 560 #if BUILDFLAG(ENABLE_APP_LIST)
559 DriveAppMapping::RegisterProfilePrefs(registry); 561 DriveAppMapping::RegisterProfilePrefs(registry);
560 app_list::AppListSyncableService::RegisterProfilePrefs(registry); 562 app_list::AppListSyncableService::RegisterProfilePrefs(registry);
561 #endif 563 #endif
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 if (distro_dict && 783 if (distro_dict &&
782 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) { 784 distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) {
783 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay); 785 profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
784 } 786 }
785 #endif // BUILDFLAG(ENABLE_RLZ) 787 #endif // BUILDFLAG(ENABLE_RLZ)
786 profile_prefs->ClearPref(kDistroDict); 788 profile_prefs->ClearPref(kDistroDict);
787 } 789 }
788 } 790 }
789 791
790 } // namespace chrome 792 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698