summaryrefslogtreecommitdiffstats
path: root/ash/test/test_session_state_delegate.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 17:21:10 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-28 00:21:29 +0000
commit0b8c9d7fb00b9b4f300abd9cca18d06236052492 (patch)
treee3d2e77e393195a083f5876c1467fe4e2966092f /ash/test/test_session_state_delegate.cc
parent8cd061582f4996cfe121232da9d957565cf6adfb (diff)
downloadchromium_src-0b8c9d7fb00b9b4f300abd9cca18d06236052492.zip
chromium_src-0b8c9d7fb00b9b4f300abd9cca18d06236052492.tar.gz
chromium_src-0b8c9d7fb00b9b4f300abd9cca18d06236052492.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=sky@chromium.org Review URL: https://codereview.chromium.org/683623002 Cr-Commit-Position: refs/heads/master@{#301511}
Diffstat (limited to 'ash/test/test_session_state_delegate.cc')
-rw-r--r--ash/test/test_session_state_delegate.cc14
1 files changed, 6 insertions, 8 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc
index c583763..ebdad58 100644
--- a/ash/test/test_session_state_delegate.cc
+++ b/ash/test/test_session_state_delegate.cc
@@ -32,29 +32,27 @@ std::string GetUserIDFromEmail(const std::string& email) {
class MockUserInfo : public user_manager::UserInfo {
public:
explicit MockUserInfo(const std::string& id) : email_(id) {}
- virtual ~MockUserInfo() {}
+ ~MockUserInfo() override {}
void SetUserImage(const gfx::ImageSkia& user_image) {
user_image_ = user_image;
}
- virtual base::string16 GetDisplayName() const override {
+ base::string16 GetDisplayName() const override {
return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray");
}
- virtual base::string16 GetGivenName() const override {
+ base::string16 GetGivenName() const override {
return base::UTF8ToUTF16("Über Über Über Über");
}
- virtual std::string GetEmail() const override { return email_; }
+ std::string GetEmail() const override { return email_; }
- virtual std::string GetUserID() const override {
+ std::string GetUserID() const override {
return GetUserIDFromEmail(GetEmail());
}
- virtual const gfx::ImageSkia& GetImage() const override {
- return user_image_;
- }
+ const gfx::ImageSkia& GetImage() const override { return user_image_; }
// A test user image.
gfx::ImageSkia user_image_;