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

Side by Side Diff: chrome/browser/chromeos/background/ash_wallpaper_delegate.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/chromeos/background/ash_wallpaper_delegate.h" 5 #include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h"
6 6
7 #include "ash/common/wallpaper/wallpaper_delegate.h"
8 #include "ash/common/wm/window_animation_types.h"
9 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wallpaper/wallpaper_delegate.h"
9 #include "ash/wm/window_animation_types.h"
10 #include "ash/wm/window_animations.h" 10 #include "ash/wm/window_animations.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" 15 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
16 #include "chrome/browser/chromeos/login/startup_utils.h" 16 #include "chrome/browser/chromeos/login/startup_utils.h"
17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
18 #include "chrome/browser/chromeos/login/wizard_controller.h" 18 #include "chrome/browser/chromeos/login/wizard_controller.h"
19 #include "chromeos/chromeos_switches.h" 19 #include "chromeos/chromeos_switches.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 DISALLOW_COPY_AND_ASSIGN(WallpaperDelegate); 132 DISALLOW_COPY_AND_ASSIGN(WallpaperDelegate);
133 }; 133 };
134 134
135 } // namespace 135 } // namespace
136 136
137 ash::WallpaperDelegate* CreateWallpaperDelegate() { 137 ash::WallpaperDelegate* CreateWallpaperDelegate() {
138 return new chromeos::WallpaperDelegate(); 138 return new chromeos::WallpaperDelegate();
139 } 139 }
140 140
141 } // namespace chromeos 141 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698