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

Side by Side Diff: ash/test/test_user_wallpaper_delegate.h

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_system_tray_delegate.h ('k') | ash/test/test_volume_control_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_
6 #define ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_ 6 #define ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_
7 7
8 #include "ash/default_user_wallpaper_delegate.h" 8 #include "ash/default_user_wallpaper_delegate.h"
9 9
10 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace test { 13 namespace test {
14 14
15 class TestUserWallpaperDelegate : public DefaultUserWallpaperDelegate { 15 class TestUserWallpaperDelegate : public DefaultUserWallpaperDelegate {
16 public: 16 public:
17 TestUserWallpaperDelegate(); 17 TestUserWallpaperDelegate();
18 virtual ~TestUserWallpaperDelegate(); 18 virtual ~TestUserWallpaperDelegate();
19 19
20 void set_custom_wallpaper(const gfx::ImageSkia& wallpaper) { 20 void set_custom_wallpaper(const gfx::ImageSkia& wallpaper) {
21 custom_wallpaper_ = wallpaper; 21 custom_wallpaper_ = wallpaper;
22 } 22 }
23 23
24 // DefaultUserWallpaperDelegate overrides: 24 // DefaultUserWallpaperDelegate overrides:
25 virtual void UpdateWallpaper(bool clear_cache) OVERRIDE; 25 virtual void UpdateWallpaper(bool clear_cache) override;
26 26
27 // Returns and clears |update_wallpaper_count_|. 27 // Returns and clears |update_wallpaper_count_|.
28 int GetUpdateWallpaperCountAndReset(); 28 int GetUpdateWallpaperCountAndReset();
29 29
30 private: 30 private:
31 // Number of times that UpdateWallpaper() has been called. 31 // Number of times that UpdateWallpaper() has been called.
32 int update_wallpaper_count_; 32 int update_wallpaper_count_;
33 33
34 // If non-null, used as custom wallpaper by UpdateWallpaper(). 34 // If non-null, used as custom wallpaper by UpdateWallpaper().
35 gfx::ImageSkia custom_wallpaper_; 35 gfx::ImageSkia custom_wallpaper_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(TestUserWallpaperDelegate); 37 DISALLOW_COPY_AND_ASSIGN(TestUserWallpaperDelegate);
38 }; 38 };
39 39
40 } // namespace test 40 } // namespace test
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_ 43 #endif // ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | ash/test/test_volume_control_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698