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

Side by Side Diff: ash/shelf/shelf_window_watcher_item_delegate.h

Issue 2908793002: [mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace (Closed)
Patch Set: Created 3 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/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.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_ITEM_DELEGATE_H_ 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
7 7
8 #include "ash/public/cpp/shelf_item_delegate.h" 8 #include "ash/public/cpp/shelf_item_delegate.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 10
11 namespace aura {
12 class Window;
13 }
14
11 namespace ash { 15 namespace ash {
12 16
13 class WmWindow;
14
15 // ShelfItemDelegate for the items created by ShelfWindowWatcher, for example: 17 // ShelfItemDelegate for the items created by ShelfWindowWatcher, for example:
16 // The Chrome OS settings window, task manager window, and panel windows. 18 // The Chrome OS settings window, task manager window, and panel windows.
17 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate { 19 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
18 public: 20 public:
19 ShelfWindowWatcherItemDelegate(const ShelfID& id, WmWindow* window); 21 ShelfWindowWatcherItemDelegate(const ShelfID& id, aura::Window* window);
20 ~ShelfWindowWatcherItemDelegate() override; 22 ~ShelfWindowWatcherItemDelegate() override;
21 23
22 private: 24 private:
23 // ShelfItemDelegate overrides: 25 // ShelfItemDelegate overrides:
24 void ItemSelected(std::unique_ptr<ui::Event> event, 26 void ItemSelected(std::unique_ptr<ui::Event> event,
25 int64_t display_id, 27 int64_t display_id,
26 ShelfLaunchSource source, 28 ShelfLaunchSource source,
27 ItemSelectedCallback callback) override; 29 ItemSelectedCallback callback) override;
28 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override; 30 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
29 void Close() override; 31 void Close() override;
30 32
31 // The window associated with this item. Not owned. 33 // The window associated with this item. Not owned.
32 WmWindow* window_; 34 aura::Window* window_;
33 35
34 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate); 36 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
35 }; 37 };
36 38
37 } // namespace ash 39 } // namespace ash
38 40
39 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ 41 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698