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

Side by Side Diff: ash/test/test_session_state_delegate.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 | « ash/test/test_session_state_delegate.h ('k') | ash/test/test_shelf_delegate.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 "ash/test/test_session_state_delegate.h" 5 #include "ash/test/test_session_state_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 20 matching lines...) Expand all
31 31
32 class MockUserInfo : public user_manager::UserInfo { 32 class MockUserInfo : public user_manager::UserInfo {
33 public: 33 public:
34 explicit MockUserInfo(const std::string& id) : email_(id) {} 34 explicit MockUserInfo(const std::string& id) : email_(id) {}
35 virtual ~MockUserInfo() {} 35 virtual ~MockUserInfo() {}
36 36
37 void SetUserImage(const gfx::ImageSkia& user_image) { 37 void SetUserImage(const gfx::ImageSkia& user_image) {
38 user_image_ = user_image; 38 user_image_ = user_image;
39 } 39 }
40 40
41 virtual base::string16 GetDisplayName() const OVERRIDE { 41 virtual base::string16 GetDisplayName() const override {
42 return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray"); 42 return base::UTF8ToUTF16("Über tray Über tray Über tray Über tray");
43 } 43 }
44 44
45 virtual base::string16 GetGivenName() const OVERRIDE { 45 virtual base::string16 GetGivenName() const override {
46 return base::UTF8ToUTF16("Über Über Über Über"); 46 return base::UTF8ToUTF16("Über Über Über Über");
47 } 47 }
48 48
49 virtual std::string GetEmail() const OVERRIDE { return email_; } 49 virtual std::string GetEmail() const override { return email_; }
50 50
51 virtual std::string GetUserID() const OVERRIDE { 51 virtual std::string GetUserID() const override {
52 return GetUserIDFromEmail(GetEmail()); 52 return GetUserIDFromEmail(GetEmail());
53 } 53 }
54 54
55 virtual const gfx::ImageSkia& GetImage() const OVERRIDE { 55 virtual const gfx::ImageSkia& GetImage() const override {
56 return user_image_; 56 return user_image_;
57 } 57 }
58 58
59 // A test user image. 59 // A test user image.
60 gfx::ImageSkia user_image_; 60 gfx::ImageSkia user_image_;
61 61
62 std::string email_; 62 std::string email_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(MockUserInfo); 64 DISALLOW_COPY_AND_ASSIGN(MockUserInfo);
65 }; 65 };
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 void TestSessionStateDelegate::AddSessionStateObserver( 235 void TestSessionStateDelegate::AddSessionStateObserver(
236 SessionStateObserver* observer) { 236 SessionStateObserver* observer) {
237 } 237 }
238 238
239 void TestSessionStateDelegate::RemoveSessionStateObserver( 239 void TestSessionStateDelegate::RemoveSessionStateObserver(
240 SessionStateObserver* observer) { 240 SessionStateObserver* observer) {
241 } 241 }
242 242
243 } // namespace test 243 } // namespace test
244 } // namespace ash 244 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_session_state_delegate.h ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698