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

Side by Side Diff: ash/shell/window_watcher_shelf_item_delegate.h

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Fix test. Created 3 years, 11 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
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/common/shelf/shelf_item_delegate.h" 8 #include "ash/common/shelf/shelf_item_delegate.h"
9 #include "ash/common/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 {
20 public: 20 public:
21 WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher); 21 WindowWatcherShelfItemDelegate(ShelfID id, WindowWatcher* watcher);
22 ~WindowWatcherShelfItemDelegate() override; 22 ~WindowWatcherShelfItemDelegate() override;
23 23
24 // ShelfItemDelegate: 24 // ShelfItemDelegate:
25 ShelfItemDelegate::PerformedAction ItemSelected( 25 ShelfItemDelegate::PerformedAction ItemSelected(
26 const ui::Event& event) override; 26 const ui::Event& event) override;
27 base::string16 GetTitle() override; 27 base::string16 GetTitle() override;
28 ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 28 ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
29 bool CanPin() const override;
30 void Close() override; 29 void Close() override;
31 30
32 private: 31 private:
33 ShelfID id_; 32 ShelfID id_;
34 WindowWatcher* watcher_; 33 WindowWatcher* watcher_;
35 34
36 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate); 35 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);
37 }; 36 };
38 37
39 } // namespace shell 38 } // namespace shell
40 } // namespace ash 39 } // namespace ash
41 40
42 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ 41 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/test/test_shelf_item_delegate.cc ('k') | ash/shell/window_watcher_shelf_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698