ash/common/shelf/shelf_window_watcher.cc - Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common.

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

Issue 2211463002: mash: Move ShelfWindowWatcher[ItemDelegate] to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move ShelfWindowWatcher to WmShell. 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

Index: ash/common/shelf/shelf_window_watcher.cc

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

similarity index 98%

rename from ash/shelf/shelf_window_watcher.cc

rename to ash/common/shelf/shelf_window_watcher.cc

index 09255fb36426d31a4f943b1ffa657586ae833057..3288f955e6277d48658f5efad10fb9ee8e0c35a4 100644

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

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

@@ -2,19 +2,19 @@

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

// found in the LICENSE file.

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

+#include "ash/common/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/shell_window_ids.h"

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

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

#include "ash/common/wm_window_property.h"

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/display/display.h"

#include "ui/display/screen.h"

« no previous file with comments | « ash/common/shelf/shelf_window_watcher.h ('k') | ash/common/shelf/shelf_window_watcher_item_delegate.h » ('j') | ash/mus/bridge/wm_window_mus.cc » ('J')