| OLD | NEW |
| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 #include "chrome/browser/supervised_user/supervised_user_service.h" | 130 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 131 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 131 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
| 132 #endif | 132 #endif |
| 133 | 133 |
| 134 #if defined(ENABLE_SERVICE_DISCOVERY) | 134 #if defined(ENABLE_SERVICE_DISCOVERY) |
| 135 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" | 135 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui.h" |
| 136 #endif | 136 #endif |
| 137 | 137 |
| 138 #if BUILDFLAG(ANDROID_JAVA_UI) | 138 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 139 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 139 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 140 #include "chrome/browser/android/ntp/most_visited_sites.h" | |
| 141 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" | 140 #include "chrome/browser/android/ntp/new_tab_page_prefs.h" |
| 142 #include "chrome/browser/android/ntp/popular_sites.h" | 141 #include "components/ntp_tiles/most_visited_sites.h" |
| 142 #include "components/ntp_tiles/popular_sites.h" |
| 143 #else | 143 #else |
| 144 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 144 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 145 #include "chrome/browser/upgrade_detector.h" | 145 #include "chrome/browser/upgrade_detector.h" |
| 146 #endif | 146 #endif |
| 147 | 147 |
| 148 #if !defined(OS_ANDROID) | 148 #if !defined(OS_ANDROID) |
| 149 #include "chrome/browser/signin/signin_promo.h" | 149 #include "chrome/browser/signin/signin_promo.h" |
| 150 #include "chrome/browser/ui/webui/foreign_session_handler.h" | 150 #include "chrome/browser/ui/webui/foreign_session_handler.h" |
| 151 #endif | 151 #endif |
| 152 | 152 |
| (...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, | 701 profile_prefs->SetInt64(prefs::kDefaultBrowserLastDeclined, |
| 702 install_time.ToInternalValue()); | 702 install_time.ToInternalValue()); |
| 703 } | 703 } |
| 704 profile_prefs->ClearPref(kCheckDefaultBrowser); | 704 profile_prefs->ClearPref(kCheckDefaultBrowser); |
| 705 | 705 |
| 706 // Added 5/2016. | 706 // Added 5/2016. |
| 707 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); | 707 profile_prefs->ClearPref(kDesktopSearchRedirectionInfobarShownPref); |
| 708 } | 708 } |
| 709 | 709 |
| 710 } // namespace chrome | 710 } // namespace chrome |
| OLD | NEW |