summaryrefslogtreecommitdiffstats
path: root/components/user_manager
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-29 14:27:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 21:28:20 +0000
commit30a1b15432dd20cf910f96ec35e27a94f769640e (patch)
treec9f5ffdb5c802fe2a26a22d499b700b49fe8f509 /components/user_manager
parent6913b7737d6124633109d6e3da31689d7ffef838 (diff)
downloadchromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.zip
chromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.tar.gz
chromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=caitkp@chromium.org Review URL: https://codereview.chromium.org/684513002 Cr-Commit-Position: refs/heads/master@{#301931}
Diffstat (limited to 'components/user_manager')
-rw-r--r--components/user_manager/empty_user_info.h12
-rw-r--r--components/user_manager/user_info_impl.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/components/user_manager/empty_user_info.h b/components/user_manager/empty_user_info.h
index 01dcfbf..52d677c 100644
--- a/components/user_manager/empty_user_info.h
+++ b/components/user_manager/empty_user_info.h
@@ -19,14 +19,14 @@ namespace user_manager {
class USER_MANAGER_EXPORT EmptyUserInfo : public UserInfo {
public:
EmptyUserInfo();
- virtual ~EmptyUserInfo();
+ ~EmptyUserInfo() override;
// UserInfo:
- virtual base::string16 GetDisplayName() const override;
- virtual base::string16 GetGivenName() const override;
- virtual std::string GetEmail() const override;
- virtual std::string GetUserID() const override;
- virtual const gfx::ImageSkia& GetImage() const override;
+ base::string16 GetDisplayName() const override;
+ base::string16 GetGivenName() const override;
+ std::string GetEmail() const override;
+ std::string GetUserID() const override;
+ const gfx::ImageSkia& GetImage() const override;
private:
const gfx::ImageSkia null_image_;
diff --git a/components/user_manager/user_info_impl.h b/components/user_manager/user_info_impl.h
index ada257d..d23ca0c 100644
--- a/components/user_manager/user_info_impl.h
+++ b/components/user_manager/user_info_impl.h
@@ -18,14 +18,14 @@ namespace user_manager {
class USER_MANAGER_EXPORT UserInfoImpl : public UserInfo {
public:
UserInfoImpl();
- virtual ~UserInfoImpl();
+ ~UserInfoImpl() override;
// UserInfo:
- virtual base::string16 GetDisplayName() const override;
- virtual base::string16 GetGivenName() const override;
- virtual std::string GetEmail() const override;
- virtual std::string GetUserID() const override;
- virtual const gfx::ImageSkia& GetImage() const override;
+ base::string16 GetDisplayName() const override;
+ base::string16 GetGivenName() const override;
+ std::string GetEmail() const override;
+ std::string GetUserID() const override;
+ const gfx::ImageSkia& GetImage() const override;
private:
gfx::ImageSkia user_image_;