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

Unified Diff: ash/test/test_user_wallpaper_delegate.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_user_wallpaper_delegate.h ('k') | ash/test/test_wallpaper_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_user_wallpaper_delegate.cc
diff --git a/ash/test/test_user_wallpaper_delegate.cc b/ash/test/test_user_wallpaper_delegate.cc
deleted file mode 100644
index 76b9f64ae6f77086b3738d9598a2081314aeeff5..0000000000000000000000000000000000000000
--- a/ash/test/test_user_wallpaper_delegate.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/test/test_user_wallpaper_delegate.h"
-
-#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/shell.h"
-
-namespace ash {
-namespace test {
-
-TestUserWallpaperDelegate::TestUserWallpaperDelegate()
- : update_wallpaper_count_(0) {}
-
-TestUserWallpaperDelegate::~TestUserWallpaperDelegate() {}
-
-void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) {
- DefaultUserWallpaperDelegate::UpdateWallpaper(clear_cache);
- if (!custom_wallpaper_.isNull()) {
- Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage(
- custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH);
- }
- update_wallpaper_count_++;
-}
-
-int TestUserWallpaperDelegate::GetUpdateWallpaperCountAndReset() {
- int count = update_wallpaper_count_;
- update_wallpaper_count_ = 0;
- return count;
-}
-
-} // namespace test
-} // namespace ash
« no previous file with comments | « ash/test/test_user_wallpaper_delegate.h ('k') | ash/test/test_wallpaper_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698