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

Side by Side Diff: components/user_manager/user.cc

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « components/user_manager/user.h ('k') | components/user_manager/user_info_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/user_manager/user.h" 5 #include "components/user_manager/user.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 24 matching lines...) Expand all
35 void User::SetIsSupervised(bool is_supervised) { 35 void User::SetIsSupervised(bool is_supervised) {
36 VLOG(1) << "Ignoring SetIsSupervised call with param " << is_supervised; 36 VLOG(1) << "Ignoring SetIsSupervised call with param " << is_supervised;
37 } 37 }
38 38
39 class RegularUser : public User { 39 class RegularUser : public User {
40 public: 40 public:
41 explicit RegularUser(const std::string& email); 41 explicit RegularUser(const std::string& email);
42 virtual ~RegularUser(); 42 virtual ~RegularUser();
43 43
44 // Overridden from User: 44 // Overridden from User:
45 virtual UserType GetType() const OVERRIDE; 45 virtual UserType GetType() const override;
46 virtual bool CanSyncImage() const OVERRIDE; 46 virtual bool CanSyncImage() const override;
47 virtual void SetIsSupervised(bool is_supervised) OVERRIDE { 47 virtual void SetIsSupervised(bool is_supervised) override {
48 VLOG(1) << "Setting user is supervised to " << is_supervised; 48 VLOG(1) << "Setting user is supervised to " << is_supervised;
49 is_supervised_ = is_supervised; 49 is_supervised_ = is_supervised;
50 } 50 }
51 virtual bool IsSupervised() const OVERRIDE { 51 virtual bool IsSupervised() const override {
52 return is_supervised_; 52 return is_supervised_;
53 } 53 }
54 54
55 private: 55 private:
56 bool is_supervised_; 56 bool is_supervised_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(RegularUser); 58 DISALLOW_COPY_AND_ASSIGN(RegularUser);
59 }; 59 };
60 60
61 class GuestUser : public User { 61 class GuestUser : public User {
62 public: 62 public:
63 GuestUser(); 63 GuestUser();
64 virtual ~GuestUser(); 64 virtual ~GuestUser();
65 65
66 // Overridden from User: 66 // Overridden from User:
67 virtual UserType GetType() const OVERRIDE; 67 virtual UserType GetType() const override;
68 68
69 private: 69 private:
70 DISALLOW_COPY_AND_ASSIGN(GuestUser); 70 DISALLOW_COPY_AND_ASSIGN(GuestUser);
71 }; 71 };
72 72
73 class KioskAppUser : public User { 73 class KioskAppUser : public User {
74 public: 74 public:
75 explicit KioskAppUser(const std::string& app_id); 75 explicit KioskAppUser(const std::string& app_id);
76 virtual ~KioskAppUser(); 76 virtual ~KioskAppUser();
77 77
78 // Overridden from User: 78 // Overridden from User:
79 virtual UserType GetType() const OVERRIDE; 79 virtual UserType GetType() const override;
80 80
81 private: 81 private:
82 DISALLOW_COPY_AND_ASSIGN(KioskAppUser); 82 DISALLOW_COPY_AND_ASSIGN(KioskAppUser);
83 }; 83 };
84 84
85 class SupervisedUser : public User { 85 class SupervisedUser : public User {
86 public: 86 public:
87 explicit SupervisedUser(const std::string& username); 87 explicit SupervisedUser(const std::string& username);
88 virtual ~SupervisedUser(); 88 virtual ~SupervisedUser();
89 89
90 // Overridden from User: 90 // Overridden from User:
91 virtual UserType GetType() const OVERRIDE; 91 virtual UserType GetType() const override;
92 virtual bool IsSupervised() const OVERRIDE; 92 virtual bool IsSupervised() const override;
93 virtual std::string display_email() const OVERRIDE; 93 virtual std::string display_email() const override;
94 94
95 private: 95 private:
96 DISALLOW_COPY_AND_ASSIGN(SupervisedUser); 96 DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
97 }; 97 };
98 98
99 class RetailModeUser : public User { 99 class RetailModeUser : public User {
100 public: 100 public:
101 RetailModeUser(); 101 RetailModeUser();
102 virtual ~RetailModeUser(); 102 virtual ~RetailModeUser();
103 103
104 // Overridden from User: 104 // Overridden from User:
105 virtual UserType GetType() const OVERRIDE; 105 virtual UserType GetType() const override;
106 106
107 private: 107 private:
108 DISALLOW_COPY_AND_ASSIGN(RetailModeUser); 108 DISALLOW_COPY_AND_ASSIGN(RetailModeUser);
109 }; 109 };
110 110
111 class PublicAccountUser : public User { 111 class PublicAccountUser : public User {
112 public: 112 public:
113 explicit PublicAccountUser(const std::string& email); 113 explicit PublicAccountUser(const std::string& email);
114 virtual ~PublicAccountUser(); 114 virtual ~PublicAccountUser();
115 115
116 // Overridden from User: 116 // Overridden from User:
117 virtual UserType GetType() const OVERRIDE; 117 virtual UserType GetType() const override;
118 118
119 private: 119 private:
120 DISALLOW_COPY_AND_ASSIGN(PublicAccountUser); 120 DISALLOW_COPY_AND_ASSIGN(PublicAccountUser);
121 }; 121 };
122 122
123 std::string User::GetEmail() const { 123 std::string User::GetEmail() const {
124 return display_email(); 124 return display_email();
125 } 125 }
126 126
127 base::string16 User::GetDisplayName() const { 127 base::string16 User::GetDisplayName() const {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 case user_manager::USER_TYPE_SUPERVISED: 333 case user_manager::USER_TYPE_SUPERVISED:
334 case user_manager::USER_TYPE_KIOSK_APP: 334 case user_manager::USER_TYPE_KIOSK_APP:
335 return false; 335 return false;
336 default: 336 default:
337 NOTREACHED(); 337 NOTREACHED();
338 } 338 }
339 return false; 339 return false;
340 } 340 }
341 341
342 } // namespace user_manager 342 } // namespace user_manager
OLDNEW
« no previous file with comments | « components/user_manager/user.h ('k') | components/user_manager/user_info_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698