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

Side by Side Diff: ui/message_center/notifier_settings.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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
« no previous file with comments | « ui/message_center/notifier_settings.h ('k') | ui/message_center/views/bounded_label.h » ('j') | 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/logging.h" 5 #include "base/logging.h"
6 #include "base/strings/string_number_conversions.h" 6 #include "base/strings/string_number_conversions.h"
7 #include "ui/message_center/notifier_settings.h" 7 #include "ui/message_center/notifier_settings.h"
8 8
9 namespace message_center { 9 namespace message_center {
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 if (profile_id != other.profile_id) 44 if (profile_id != other.profile_id)
45 return profile_id < other.profile_id; 45 return profile_id < other.profile_id;
46 46
47 if (type == WEB_PAGE) 47 if (type == WEB_PAGE)
48 return url < other.url; 48 return url < other.url;
49 49
50 return id < other.id; 50 return id < other.id;
51 } 51 }
52 52
53 Notifier::Notifier(const NotifierId& notifier_id, 53 Notifier::Notifier(const NotifierId& notifier_id,
54 const string16& name, 54 const base::string16& name,
55 bool enabled) 55 bool enabled)
56 : notifier_id(notifier_id), 56 : notifier_id(notifier_id),
57 name(name), 57 name(name),
58 enabled(enabled) { 58 enabled(enabled) {
59 } 59 }
60 60
61 Notifier::~Notifier() { 61 Notifier::~Notifier() {
62 } 62 }
63 63
64 NotifierGroup::NotifierGroup(const gfx::Image& icon, 64 NotifierGroup::NotifierGroup(const gfx::Image& icon,
65 const string16& name, 65 const base::string16& name,
66 const string16& login_info, 66 const base::string16& login_info,
67 size_t index) 67 size_t index)
68 : icon(icon), name(name), login_info(login_info), index(index) {} 68 : icon(icon), name(name), login_info(login_info), index(index) {}
69 69
70 NotifierGroup::~NotifierGroup() {} 70 NotifierGroup::~NotifierGroup() {}
71 71
72 } // namespace message_center 72 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/notifier_settings.h ('k') | ui/message_center/views/bounded_label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698