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

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

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years 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 | Annotate | Revision Log
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_LAUNCHER_ITEM_DELEGATE_ 5 #ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
6 #define ASH_SHELL_WINDOW_WATCHER_LAUNCHER_ITEM_DELEGATE_ 6 #define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
7 7
8 #include "ash/launcher/launcher_item_delegate.h" 8 #include "ash/launcher/launcher_types.h"
9 #include "ash/shelf/shelf_item_delegate.h"
9 #include "base/basictypes.h" 10 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 12
12 namespace ash { 13 namespace ash {
13 namespace shell { 14 namespace shell {
14 15
15 class WindowWatcher; 16 class WindowWatcher;
16 17
17 // LauncherItemDelegate implementation used by WindowWatcher. 18 // ShelfItemDelegate implementation used by WindowWatcher.
18 class WindowWatcherLauncherItemDelegate : public ash::LauncherItemDelegate { 19 class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
19 public: 20 public:
20 WindowWatcherLauncherItemDelegate(ash::LauncherID id, 21 WindowWatcherShelfItemDelegate(LauncherID id, WindowWatcher* watcher);
21 ash::shell::WindowWatcher* watcher); 22 virtual ~WindowWatcherShelfItemDelegate();
22 virtual ~WindowWatcherLauncherItemDelegate();
23 23
24 // ash::LauncherItemDelegate overrides: 24 // ShelfItemDelegate:
25 virtual bool ItemSelected(const ui::Event& event) OVERRIDE; 25 virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
26 virtual base::string16 GetTitle() OVERRIDE; 26 virtual base::string16 GetTitle() OVERRIDE;
27 virtual ui::MenuModel* CreateContextMenu( 27 virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
28 aura::Window* root_window) OVERRIDE; 28 virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
29 virtual ash::LauncherMenuModel* CreateApplicationMenu(
30 int event_flags) OVERRIDE;
31 virtual bool IsDraggable() OVERRIDE; 29 virtual bool IsDraggable() OVERRIDE;
32 virtual bool ShouldShowTooltip() OVERRIDE; 30 virtual bool ShouldShowTooltip() OVERRIDE;
33 31
34 private: 32 private:
35 ash::LauncherID id_; 33 LauncherID id_;
36 ash::shell::WindowWatcher* watcher_; 34 WindowWatcher* watcher_;
37 35
38 DISALLOW_COPY_AND_ASSIGN(WindowWatcherLauncherItemDelegate); 36 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);
39 }; 37 };
40 38
41 } // namespace shell 39 } // namespace shell
42 } // namespace ash 40 } // namespace ash
43 41
44 #endif // ASH_SHELL_WINDOW_WATCHER_LAUNCHER_ITEM_DELEGATE_ 42 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/window_watcher_launcher_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