| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/webui/ntp/most_visited_handler.h" | 5 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/browser/prefs/pref_service.h" | 23 #include "chrome/browser/prefs/pref_service.h" |
| 24 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 24 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" | 26 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |
| 27 #include "chrome/browser/ui/webui/favicon_source.h" | 27 #include "chrome/browser/ui/webui/favicon_source.h" |
| 28 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" | 28 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" |
| 29 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" | 29 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" |
| 30 #include "chrome/common/chrome_notification_types.h" | 30 #include "chrome/common/chrome_notification_types.h" |
| 31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
| 32 #include "chrome/common/url_constants.h" | 32 #include "chrome/common/url_constants.h" |
| 33 #include "content/browser/webui/web_ui.h" |
| 33 #include "content/public/browser/browser_thread.h" | 34 #include "content/public/browser/browser_thread.h" |
| 34 #include "content/public/browser/notification_source.h" | 35 #include "content/public/browser/notification_source.h" |
| 35 #include "content/public/browser/user_metrics.h" | 36 #include "content/public/browser/user_metrics.h" |
| 36 #include "googleurl/src/gurl.h" | 37 #include "googleurl/src/gurl.h" |
| 37 #include "grit/chromium_strings.h" | 38 #include "grit/chromium_strings.h" |
| 38 #include "grit/generated_resources.h" | 39 #include "grit/generated_resources.h" |
| 39 #include "grit/locale_settings.h" | 40 #include "grit/locale_settings.h" |
| 40 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
| 41 | 42 |
| 42 using content::UserMetricsAction; | 43 using content::UserMetricsAction; |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 } | 207 } |
| 207 | 208 |
| 208 // static | 209 // static |
| 209 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) { | 210 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) { |
| 210 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist, | 211 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist, |
| 211 PrefService::UNSYNCABLE_PREF); | 212 PrefService::UNSYNCABLE_PREF); |
| 212 // TODO(estade): remove this. | 213 // TODO(estade): remove this. |
| 213 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs, | 214 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs, |
| 214 PrefService::UNSYNCABLE_PREF); | 215 PrefService::UNSYNCABLE_PREF); |
| 215 } | 216 } |
| OLD | NEW |