summaryrefslogtreecommitdiffstats
path: root/components/user_manager
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 04:24:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 11:25:34 +0000
commit00ea022b81af00857b352bae68d4ba2eb3e1493b (patch)
treeb5e3e536a25f154ab5410d611736832c11b2cfad /components/user_manager
parent0b0885ca539071e7864061fde54c7345a0fd2aae (diff)
downloadchromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.zip
chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.gz
chromium_src-00ea022b81af00857b352bae68d4ba2eb3e1493b.tar.bz2
Standardize usage of virtual/override/final in components/
BUG=417463 TBR=blundell@chromium.org Review URL: https://codereview.chromium.org/666133002 Cr-Commit-Position: refs/heads/master@{#300456}
Diffstat (limited to 'components/user_manager')
-rw-r--r--components/user_manager/user.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 8759efb..1a31553 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -85,11 +85,11 @@ class USER_MANAGER_EXPORT User : public UserInfo {
base::string16 display_name() const { return display_name_; }
// UserInfo
- virtual std::string GetEmail() const override;
- virtual base::string16 GetDisplayName() const override;
- virtual base::string16 GetGivenName() const override;
- virtual const gfx::ImageSkia& GetImage() const override;
- virtual std::string GetUserID() const override;
+ std::string GetEmail() const override;
+ base::string16 GetDisplayName() const override;
+ base::string16 GetGivenName() const override;
+ const gfx::ImageSkia& GetImage() const override;
+ std::string GetUserID() const override;
// Is user supervised.
virtual bool IsSupervised() const;
@@ -174,7 +174,7 @@ class USER_MANAGER_EXPORT User : public UserInfo {
static User* CreatePublicAccountUser(const std::string& email);
explicit User(const std::string& email);
- virtual ~User();
+ ~User() override;
const std::string* GetAccountLocale() const { return account_locale_.get(); }