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/shell/window_watcher_shelf_item_delegate.h

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: Created 4 years, 6 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/shell/window_watcher.cc ('k') | ash/sysui/shelf_delegate_mus.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_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ 5 #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
6 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ 6 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
7 7
8 #include "ash/shelf/shelf_item_delegate.h" 8 #include "ash/common/shelf/shelf_item_delegate.h"
9 #include "ash/shelf/shelf_item_types.h" 9 #include "ash/common/shelf/shelf_item_types.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace shell { 14 namespace shell {
15 15
16 class WindowWatcher; 16 class WindowWatcher;
17 17
18 // ShelfItemDelegate implementation used by WindowWatcher. 18 // ShelfItemDelegate implementation used by WindowWatcher.
19 class WindowWatcherShelfItemDelegate : public ShelfItemDelegate { 19 class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
(...skipping 15 matching lines...) Expand all
35 ShelfID id_; 35 ShelfID id_;
36 WindowWatcher* watcher_; 36 WindowWatcher* watcher_;
37 37
38 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate); 38 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);
39 }; 39 };
40 40
41 } // namespace shell 41 } // namespace shell
42 } // namespace ash 42 } // namespace ash
43 43
44 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ 44 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/sysui/shelf_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698