ash/shelf/shelf_window_watcher.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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/shelf/shelf_window_watcher.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:

Index: ash/shelf/shelf_window_watcher.cc

diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc

similarity index 96%

rename from ash/common/shelf/shelf_window_watcher.cc

rename to ash/shelf/shelf_window_watcher.cc

index 7a00df9d0f3af50728835d8dd96b9ca530a02e36..4f04d95f2d7d0a1f84927a5cf362876a7aa25663 100644

--- a/ash/common/shelf/shelf_window_watcher.cc

+++ b/ash/shelf/shelf_window_watcher.cc

@@ -2,23 +2,23 @@

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

// found in the LICENSE file.

-#include "ash/common/shelf/shelf_window_watcher.h"

+#include "ash/shelf/shelf_window_watcher.h"

#include <memory>

#include <utility>

-#include "ash/common/shelf/shelf_constants.h"

-#include "ash/common/shelf/shelf_model.h"

-#include "ash/common/shelf/shelf_window_watcher_item_delegate.h"

-#include "ash/common/wm/window_state.h"

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

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

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

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

+#include "ash/shelf/shelf_constants.h"

+#include "ash/shelf/shelf_model.h"

+#include "ash/shelf/shelf_window_watcher_item_delegate.h"

#include "ash/shell.h"

#include "ash/wm/window_properties.h"

+#include "ash/wm/window_state.h"

#include "ash/wm/window_state_aura.h"

#include "ash/wm/window_util.h"

+#include "ash/wm_shell.h"

+#include "ash/wm_window.h"

#include "ui/aura/client/aura_constants.h"

#include "ui/aura/env.h"

#include "ui/aura/window.h"

« no previous file with comments | « ash/shelf/shelf_window_watcher.h ('k') | ash/shelf/shelf_window_watcher_item_delegate.h » ('j') | no next file with comments »