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

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

Issue 10919049: Fix for clang chromium-style in promo. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/browser/web_resource/notification_promo_mobile_ntp.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_mobile_ntp.h" 5 #include "chrome/browser/web_resource/notification_promo_mobile_ntp.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/web_resource/notification_promo.h" 9 #include "chrome/browser/web_resource/notification_promo.h"
10 10
11 11
12 NotificationPromoMobileNtp::NotificationPromoMobileNtp(Profile* profile) 12 NotificationPromoMobileNtp::NotificationPromoMobileNtp(Profile* profile)
13 : valid_(false), 13 : valid_(false),
14 action_args_(NULL), 14 action_args_(NULL),
15 payload_(NULL), 15 payload_(NULL),
16 notification_promo_(profile) { 16 notification_promo_(profile) {
17 } 17 }
18 18
19 NotificationPromoMobileNtp::~NotificationPromoMobileNtp() {
20 }
21
19 bool NotificationPromoMobileNtp::InitFromPrefs() { 22 bool NotificationPromoMobileNtp::InitFromPrefs() {
20 notification_promo_.InitFromPrefs(NotificationPromo::MOBILE_NTP_SYNC_PROMO); 23 notification_promo_.InitFromPrefs(NotificationPromo::MOBILE_NTP_SYNC_PROMO);
21 return InitFromNotificationPromo(); 24 return InitFromNotificationPromo();
22 } 25 }
23 26
24 bool NotificationPromoMobileNtp::InitFromJson( 27 bool NotificationPromoMobileNtp::InitFromJson(
25 const base::DictionaryValue& json) { 28 const base::DictionaryValue& json) {
26 notification_promo_.InitFromJson( 29 notification_promo_.InitFromJson(
27 json, NotificationPromo::MOBILE_NTP_SYNC_PROMO); 30 json, NotificationPromo::MOBILE_NTP_SYNC_PROMO);
28 return InitFromNotificationPromo(); 31 return InitFromNotificationPromo();
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 payload_->GetBoolean("promo_show_on_most_visited", &show_on_most_visited_); 63 payload_->GetBoolean("promo_show_on_most_visited", &show_on_most_visited_);
61 payload_->GetBoolean("promo_show_on_open_tabs", &show_on_open_tabs_); 64 payload_->GetBoolean("promo_show_on_open_tabs", &show_on_open_tabs_);
62 payload_->GetBoolean("promo_show_as_virtual_computer", 65 payload_->GetBoolean("promo_show_as_virtual_computer",
63 &show_as_virtual_computer_); 66 &show_as_virtual_computer_);
64 payload_->GetString("promo_virtual_computer_title", &virtual_computer_title_); 67 payload_->GetString("promo_virtual_computer_title", &virtual_computer_title_);
65 payload_->GetString("promo_virtual_computer_lastsync", 68 payload_->GetString("promo_virtual_computer_lastsync",
66 &virtual_computer_lastsync_); 69 &virtual_computer_lastsync_);
67 70
68 return valid_; 71 return valid_;
69 } 72 }
OLDNEW
« no previous file with comments | « chrome/browser/web_resource/notification_promo_mobile_ntp.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698