ash/common/wallpaper/wallpaper_controller.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/wallpaper/wallpaper_controller.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (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:

Index: ash/common/wallpaper/wallpaper_controller.cc

diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/common/wallpaper/wallpaper_controller.cc

similarity index 96%

rename from ash/wallpaper/wallpaper_controller.cc

rename to ash/common/wallpaper/wallpaper_controller.cc

index 6d6449df4437172d019c4c04318844dc1e2ac138..42e70a74423a8e63d2deda24241c925656ca9b3f 100644

--- a/ash/wallpaper/wallpaper_controller.cc

+++ b/ash/common/wallpaper/wallpaper_controller.cc

@@ -2,20 +2,20 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/wallpaper/wallpaper_controller.h"

+#include "ash/common/wallpaper/wallpaper_controller.h"

#include <string>

#include <utility>

-#include "ash/ash_switches.h"

+#include "ash/common/ash_switches.h"

+#include "ash/common/wallpaper/wallpaper_controller_observer.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

+#include "ash/common/wallpaper/wallpaper_view.h"

+#include "ash/common/wallpaper/wallpaper_widget_controller.h"

+#include "ash/common/wm_shell.h"

+#include "ash/common/wm_window.h"

#include "ash/public/cpp/shell_window_ids.h"

#include "ash/root_window_controller.h"

-#include "ash/wallpaper/wallpaper_controller_observer.h"

-#include "ash/wallpaper/wallpaper_delegate.h"

-#include "ash/wallpaper/wallpaper_view.h"

-#include "ash/wallpaper/wallpaper_widget_controller.h"

-#include "ash/wm_shell.h"

-#include "ash/wm_window.h"

#include "base/bind.h"

#include "base/command_line.h"

#include "base/logging.h"