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

Side by Side Diff: chrome/browser/web_resource/notification_promo.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. 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/web_resource/notification_promo.h" 5 #include "chrome/browser/web_resource/notification_promo.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/rand_util.h" 11 #include "base/rand_util.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "base/threading/thread_restrictions.h" 15 #include "base/threading/thread_restrictions.h"
16 #include "base/time.h" 16 #include "base/time.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/prefs/pref_registry_simple.h"
19 #include "chrome/browser/prefs/pref_service.h" 20 #include "chrome/browser/prefs/pref_service.h"
20 #include "chrome/browser/prefs/pref_service_simple.h"
21 #include "chrome/browser/prefs/pref_service_syncable.h" 21 #include "chrome/browser/prefs/pref_service_syncable.h"
22 #include "chrome/browser/web_resource/promo_resource_service.h" 22 #include "chrome/browser/web_resource/promo_resource_service.h"
23 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
24 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
25 #include "content/public/browser/user_metrics.h" 25 #include "content/public/browser/user_metrics.h"
26 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
27 #include "net/base/url_util.h" 27 #include "net/base/url_util.h"
28 28
29 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID)
30 #include "base/command_line.h" 30 #include "base/command_line.h"
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 } 303 }
304 304
305 void NotificationPromo::OnNewNotification() { 305 void NotificationPromo::OnNewNotification() {
306 DVLOG(1) << "OnNewNotification"; 306 DVLOG(1) << "OnNewNotification";
307 // Create a new promo group. 307 // Create a new promo group.
308 group_ = base::RandInt(0, num_groups_ - 1); 308 group_ = base::RandInt(0, num_groups_ - 1);
309 WritePrefs(); 309 WritePrefs();
310 } 310 }
311 311
312 // static 312 // static
313 void NotificationPromo::RegisterPrefs(PrefServiceSimple* local_state) { 313 void NotificationPromo::RegisterPrefs(PrefRegistrySimple* registry) {
314 local_state->RegisterDictionaryPref(kPrefPromoObject); 314 registry->RegisterDictionaryPref(kPrefPromoObject);
315 } 315 }
316 316
317 // static 317 // static
318 void NotificationPromo::RegisterUserPrefs(PrefServiceSyncable* prefs) { 318 void NotificationPromo::RegisterUserPrefs(PrefServiceSyncable* prefs) {
319 // TODO(dbeam): Remove in M28 when we're reasonably sure all prefs are gone. 319 // TODO(dbeam): Remove in M28 when we're reasonably sure all prefs are gone.
320 // http://crbug.com/168887 320 // http://crbug.com/168887
321 prefs->RegisterDictionaryPref(kPrefPromoObject, 321 prefs->RegisterDictionaryPref(kPrefPromoObject,
322 PrefServiceSyncable::UNSYNCABLE_PREF); 322 PrefServiceSyncable::UNSYNCABLE_PREF);
323 prefs->ClearPref(kPrefPromoObject); 323 prefs->ClearPref(kPrefPromoObject);
324 } 324 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 if (group_ < initial_segment_) 444 if (group_ < initial_segment_)
445 return start_; 445 return start_;
446 return start_ + 446 return start_ +
447 std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_) 447 std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
448 * time_slice_; 448 * time_slice_;
449 } 449 }
450 450
451 double NotificationPromo::EndTime() const { 451 double NotificationPromo::EndTime() const {
452 return end_; 452 return end_;
453 } 453 }
OLDNEW
« no previous file with comments | « chrome/browser/web_resource/notification_promo.h ('k') | chrome/browser/web_resource/plugins_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698