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

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

Issue 2192553002: mash: Convert ShelfWindowWatcher to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and better test 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/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/common/shelf/shelf_item_delegate.h" 8 #include "ash/common/shelf/shelf_item_delegate.h"
9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 9 #include "base/macros.h"
11 10
12 namespace aura { 11 namespace ash {
13 class Window;
14 }
15 12
16 namespace ash { 13 class WmWindow;
17 14
18 // ShelfItemDelegate for the items created by ShelfWindowWatcher. 15 // ShelfItemDelegate for the items created by ShelfWindowWatcher.
19 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate { 16 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
20 public: 17 public:
21 explicit ShelfWindowWatcherItemDelegate(aura::Window* window); 18 explicit ShelfWindowWatcherItemDelegate(WmWindow* window);
22 ~ShelfWindowWatcherItemDelegate() override; 19 ~ShelfWindowWatcherItemDelegate() override;
23 20
24 private: 21 private:
25 // ShelfItemDelegate overrides: 22 // ShelfItemDelegate overrides:
26 ShelfItemDelegate::PerformedAction ItemSelected( 23 ShelfItemDelegate::PerformedAction ItemSelected(
27 const ui::Event& event) override; 24 const ui::Event& event) override;
28 base::string16 GetTitle() override; 25 base::string16 GetTitle() override;
29 ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 26 ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
30 bool IsDraggable() override; 27 bool IsDraggable() override;
31 bool CanPin() const override; 28 bool CanPin() const override;
32 bool ShouldShowTooltip() override; 29 bool ShouldShowTooltip() override;
33 void Close() override; 30 void Close() override;
34 31
35 // Stores a Window associated with this item. Not owned. 32 // The window associated with this item. Not owned.
36 aura::Window* window_; 33 WmWindow* window_;
37 34
38 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate); 35 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
39 }; 36 };
40 37
41 } // namespace ash 38 } // namespace ash
42 39
43 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ 40 #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