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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/common/shelf/shelf_window_watcher.h

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 unified diff | Download patch

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_	5 #ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_

6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_	6 #define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_

7	7

8 #include "ash/common/wm_activation_observer.h"	8 #include "ash/common/wm_activation_observer.h"

9 #include "ash/common/wm_window_observer.h"	9 #include "ash/common/wm_window_observer.h"

10 #include "base/macros.h"	10 #include "base/macros.h"

11 #include "base/scoped_observer.h"	11 #include "base/scoped_observer.h"

12 #include "ui/display/display_observer.h"	12 #include "ui/display/display_observer.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 class ShelfModel;	16 class ShelfModel;

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 UserWindowObserver user_window_observer_;	104 UserWindowObserver user_window_observer_;

105	105

106 ScopedObserver<WmWindow, ContainerWindowObserver> observed_container_windows_;	106 ScopedObserver<WmWindow, ContainerWindowObserver> observed_container_windows_;

107 ScopedObserver<WmWindow, UserWindowObserver> observed_user_windows_;	107 ScopedObserver<WmWindow, UserWindowObserver> observed_user_windows_;

108	108

109 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);	109 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);

110 };	110 };

111	111

112 } // namespace ash	112 } // namespace ash

113	113

114 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_	114 #endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_

OLD	NEW

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