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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/shell_unittest.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/shelf/shelf_item_delegate.h"
9 #include "ash/shelf/shelf_item_types.h" 9 #include "ash/shelf/shelf_item_types.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.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 virtual ~WindowWatcherShelfItemDelegate(); 22 virtual ~WindowWatcherShelfItemDelegate();
23 23
24 // ShelfItemDelegate: 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(aura::Window* root_window) OVERRIDE; 27 virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
28 virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; 28 virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
29 virtual bool IsDraggable() OVERRIDE; 29 virtual bool IsDraggable() override;
30 virtual bool ShouldShowTooltip() OVERRIDE; 30 virtual bool ShouldShowTooltip() override;
31 virtual void Close() OVERRIDE; 31 virtual void Close() override;
32 32
33 private: 33 private:
34 ShelfID id_; 34 ShelfID id_;
35 WindowWatcher* watcher_; 35 WindowWatcher* watcher_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate); 37 DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);
38 }; 38 };
39 39
40 } // namespace shell 40 } // namespace shell
41 } // namespace ash 41 } // namespace ash
42 42
43 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_ 43 #endif // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698