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

Side by Side Diff: chrome/browser/ui/webui/ntp/most_visited_handler.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 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/command_line.h" 11 #include "base/command_line.h"
12 #include "base/md5.h" 12 #include "base/md5.h"
13 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/threading/thread.h" 18 #include "base/threading/thread.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "base/values.h" 20 #include "base/values.h"
21 #include "chrome/browser/history/page_usage_data.h" 21 #include "chrome/browser/history/page_usage_data.h"
22 #include "chrome/browser/history/top_sites.h" 22 #include "chrome/browser/history/top_sites.h"
23 #include "chrome/browser/prefs/pref_registry_syncable.h"
23 #include "chrome/browser/prefs/pref_service.h" 24 #include "chrome/browser/prefs/pref_service.h"
24 #include "chrome/browser/prefs/scoped_user_pref_update.h" 25 #include "chrome/browser/prefs/scoped_user_pref_update.h"
25 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/ui/webui/favicon_source.h" 27 #include "chrome/browser/ui/webui/favicon_source.h"
27 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" 28 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
28 #include "chrome/browser/ui/webui/ntp/ntp_stats.h" 29 #include "chrome/browser/ui/webui/ntp/ntp_stats.h"
29 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" 30 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
30 #include "chrome/common/chrome_notification_types.h" 31 #include "chrome/common/chrome_notification_types.h"
31 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
32 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 if (ts) 250 if (ts)
250 ts->AddBlacklistedURL(url); 251 ts->AddBlacklistedURL(url);
251 content::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted")); 252 content::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted"));
252 } 253 }
253 254
254 std::string MostVisitedHandler::GetDictionaryKeyForUrl(const std::string& url) { 255 std::string MostVisitedHandler::GetDictionaryKeyForUrl(const std::string& url) {
255 return base::MD5String(url); 256 return base::MD5String(url);
256 } 257 }
257 258
258 // static 259 // static
259 void MostVisitedHandler::RegisterUserPrefs(PrefServiceSyncable* prefs) { 260 void MostVisitedHandler::RegisterUserPrefs(PrefRegistrySyncable* registry) {
260 prefs->RegisterDictionaryPref(prefs::kNtpMostVisitedURLsBlacklist, 261 registry->RegisterDictionaryPref(prefs::kNtpMostVisitedURLsBlacklist,
261 PrefServiceSyncable::UNSYNCABLE_PREF); 262 PrefRegistrySyncable::UNSYNCABLE_PREF);
262 } 263 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/most_visited_handler.h ('k') | chrome/browser/ui/webui/ntp/new_tab_page_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698