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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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 "base/macros.h"
10 #include "ui/gfx/image/image_skia.h" 11 #include "ui/gfx/image/image_skia.h"
11 12
12 namespace ash { 13 namespace ash {
13 namespace test { 14 namespace test {
14 15
15 class TestUserWallpaperDelegate : public DefaultUserWallpaperDelegate { 16 class TestUserWallpaperDelegate : public DefaultUserWallpaperDelegate {
16 public: 17 public:
17 TestUserWallpaperDelegate(); 18 TestUserWallpaperDelegate();
18 ~TestUserWallpaperDelegate() override; 19 ~TestUserWallpaperDelegate() override;
19 20
(...skipping 14 matching lines...) Expand all
34 // If non-null, used as custom wallpaper by UpdateWallpaper(). 35 // If non-null, used as custom wallpaper by UpdateWallpaper().
35 gfx::ImageSkia custom_wallpaper_; 36 gfx::ImageSkia custom_wallpaper_;
36 37
37 DISALLOW_COPY_AND_ASSIGN(TestUserWallpaperDelegate); 38 DISALLOW_COPY_AND_ASSIGN(TestUserWallpaperDelegate);
38 }; 39 };
39 40
40 } // namespace test 41 } // namespace test
41 } // namespace ash 42 } // namespace ash
42 43
43 #endif // ASH_TEST_TEST_USER_WALLPAPER_DELEGATE_H_ 44 #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