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

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

Issue 2657823005: Move //c/b/services/gcm/ to //c/b/gcm/ (Closed)
Patch Set: Created 3 years, 10 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 158 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
159 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h" 159 #include "chrome/browser/android/ntp/content_suggestions_notifier_service.h"
160 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h" 160 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
161 #include "chrome/browser/android/preferences/browser_prefs_android.h" 161 #include "chrome/browser/android/preferences/browser_prefs_android.h"
162 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h" 162 #include "chrome/browser/ntp_snippets/download_suggestions_provider.h"
163 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h " 163 #include "components/ntp_snippets/category_rankers/click_based_category_ranker.h "
164 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h" 164 #include "components/ntp_snippets/offline_pages/recent_tab_suggestions_provider. h"
165 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h" 165 #include "components/ntp_snippets/physical_web_pages/physical_web_page_suggestio ns_provider.h"
166 #include "components/ntp_tiles/popular_sites_impl.h" 166 #include "components/ntp_tiles/popular_sites_impl.h"
167 #else 167 #else
168 #include "chrome/browser/services/gcm/gcm_product_util.h" 168 #include "chrome/browser/gcm/gcm_product_util.h"
169 #include "chrome/browser/signin/signin_promo.h" 169 #include "chrome/browser/signin/signin_promo.h"
170 #include "chrome/browser/ui/startup/startup_browser_creator.h" 170 #include "chrome/browser/ui/startup/startup_browser_creator.h"
171 #include "chrome/browser/ui/webui/foreign_session_handler.h" 171 #include "chrome/browser/ui/webui/foreign_session_handler.h"
172 #include "chrome/browser/upgrade_detector.h" 172 #include "chrome/browser/upgrade_detector.h"
173 #endif 173 #endif
174 174
175 #if defined(OS_CHROMEOS) 175 #if defined(OS_CHROMEOS)
176 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h" 176 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
177 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 177 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
178 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 178 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 // Added 8/2016. 792 // Added 8/2016.
793 profile_prefs->ClearPref(kStaticEncodings); 793 profile_prefs->ClearPref(kStaticEncodings);
794 profile_prefs->ClearPref(kRecentlySelectedEncoding); 794 profile_prefs->ClearPref(kRecentlySelectedEncoding);
795 795
796 // Added 9/2016. 796 // Added 9/2016.
797 profile_prefs->ClearPref(kWebKitUsesUniversalDetector); 797 profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
798 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent); 798 profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
799 } 799 }
800 800
801 } // namespace chrome 801 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698