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

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

Issue 1811333003: Move the remaining NTP realted files to c/b/android/ntp subdir. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync again Created 4 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/chrome_content_browser_client.cc ('k') | chrome/chrome_browser.gypi » ('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/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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 133 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
134 #endif 134 #endif
135 135
136 #if defined(ENABLE_SERVICE_DISCOVERY) 136 #if defined(ENABLE_SERVICE_DISCOVERY)
137 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" 137 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h"
138 #endif 138 #endif
139 139
140 #if BUILDFLAG(ANDROID_JAVA_UI) 140 #if BUILDFLAG(ANDROID_JAVA_UI)
141 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 141 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
142 #include "chrome/browser/android/most_visited_sites.h" 142 #include "chrome/browser/android/most_visited_sites.h"
143 #include "chrome/browser/android/new_tab_page_prefs.h" 143 #include "chrome/browser/android/ntp/new_tab_page_prefs.h"
144 #include "chrome/browser/android/popular_sites.h" 144 #include "chrome/browser/android/popular_sites.h"
145 #else 145 #else
146 #include "chrome/browser/ui/startup/startup_browser_creator.h" 146 #include "chrome/browser/ui/startup/startup_browser_creator.h"
147 #include "chrome/browser/upgrade_detector.h" 147 #include "chrome/browser/upgrade_detector.h"
148 #endif 148 #endif
149 149
150 #if !defined(OS_ANDROID) 150 #if !defined(OS_ANDROID)
151 #include "chrome/browser/signin/signin_promo.h" 151 #include "chrome/browser/signin/signin_promo.h"
152 #include "chrome/browser/ui/webui/foreign_session_handler.h" 152 #include "chrome/browser/ui/webui/foreign_session_handler.h"
153 #endif 153 #endif
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold); 667 profile_prefs->ClearPref(kOverscrollVerticalResistThreshold);
668 #endif // defined(USE_AURA) 668 #endif // defined(USE_AURA)
669 669
670 #if BUILDFLAG(ENABLE_GOOGLE_NOW) 670 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
671 // Added 3/2016. 671 // Added 3/2016.
672 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled); 672 profile_prefs->ClearPref(kGoogleGeolocationAccessEnabled);
673 #endif 673 #endif
674 } 674 }
675 675
676 } // namespace chrome 676 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698