| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/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" |
| 11 #include "base/callback_old.h" | |
| 12 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 13 #include "base/md5.h" | 12 #include "base/md5.h" |
| 14 #include "base/memory/scoped_vector.h" | 13 #include "base/memory/scoped_vector.h" |
| 15 #include "base/memory/singleton.h" | 14 #include "base/memory/singleton.h" |
| 16 #include "base/string16.h" | 15 #include "base/string16.h" |
| 17 #include "base/string_number_conversions.h" | 16 #include "base/string_number_conversions.h" |
| 18 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
| 19 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 20 #include "base/values.h" | 19 #include "base/values.h" |
| 21 #include "chrome/browser/history/page_usage_data.h" | 20 #include "chrome/browser/history/page_usage_data.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 } | 206 } |
| 208 | 207 |
| 209 // static | 208 // static |
| 210 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) { | 209 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) { |
| 211 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist, | 210 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist, |
| 212 PrefService::UNSYNCABLE_PREF); | 211 PrefService::UNSYNCABLE_PREF); |
| 213 // TODO(estade): remove this. | 212 // TODO(estade): remove this. |
| 214 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs, | 213 prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs, |
| 215 PrefService::UNSYNCABLE_PREF); | 214 PrefService::UNSYNCABLE_PREF); |
| 216 } | 215 } |
| OLD | NEW |