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

Unified Diff: chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT Created 6 years, 7 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
Index: chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
diff --git a/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
similarity index 94%
rename from chrome/browser/ui/ash/user_wallpaper_delegate_win.cc
rename to chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
index 92ce758ea04a61a9db144ad682a4970cdaee77ec..f45a90af21bb7f1fc22ed8c4e80684f80e724735 100644
--- a/chrome/browser/ui/ash/user_wallpaper_delegate_win.cc
+++ b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/desktop_background/user_wallpaper_delegate.h"
+#include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h"
#include "ash/desktop_background/desktop_background_controller.h"
+#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/shell.h"
#include "ash/wm/window_animations.h"
#include "base/basictypes.h"
@@ -86,6 +87,6 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
} // namespace
-ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
+ash::UserWallpaperDelegate* CreateSolidColorUserWallpaperDelegate() {
return new UserWallpaperDelegate();
}
« no previous file with comments | « chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h ('k') | chrome/browser/ui/ash/user_wallpaper_delegate_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698