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

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: Add TODO comments with bug for WmWindowMus ShelfItemDetails support. 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
« no previous file with comments | « ash/aura/wm_window_aura.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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_
OLDNEW
« no previous file with comments | « ash/aura/wm_window_aura.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698