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

Side by Side Diff: ash/shelf/shelf_window_watcher_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/shelf/shelf_window_watcher.h ('k') | ash/shelf/shelf_window_watcher_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_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/shelf/shelf_item_delegate.h" 8 #include "ash/shelf/shelf_item_delegate.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 11
12 namespace aura { 12 namespace aura {
13 class Window; 13 class Window;
14 } 14 }
15 15
16 namespace ash { 16 namespace ash {
17 class ShelfModel; 17 class ShelfModel;
18 18
19 // ShelfItemDelegate for the items created by ShelfWindowWatcher. 19 // ShelfItemDelegate for the items created by ShelfWindowWatcher.
20 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate { 20 class ShelfWindowWatcherItemDelegate : public ShelfItemDelegate {
21 public: 21 public:
22 ShelfWindowWatcherItemDelegate(aura::Window* window, ShelfModel* model_); 22 ShelfWindowWatcherItemDelegate(aura::Window* window, ShelfModel* model_);
23 23
24 virtual ~ShelfWindowWatcherItemDelegate(); 24 virtual ~ShelfWindowWatcherItemDelegate();
25 25
26 private: 26 private:
27 // ShelfItemDelegate overrides: 27 // ShelfItemDelegate overrides:
28 virtual bool ItemSelected(const ui::Event& event) OVERRIDE; 28 virtual bool ItemSelected(const ui::Event& event) override;
29 virtual base::string16 GetTitle() OVERRIDE; 29 virtual base::string16 GetTitle() override;
30 virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE; 30 virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
31 virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE; 31 virtual ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
32 virtual bool IsDraggable() OVERRIDE; 32 virtual bool IsDraggable() override;
33 virtual bool ShouldShowTooltip() OVERRIDE; 33 virtual bool ShouldShowTooltip() override;
34 virtual void Close() OVERRIDE; 34 virtual void Close() override;
35 35
36 // Stores a Window associated with this item. Not owned. 36 // Stores a Window associated with this item. Not owned.
37 aura::Window* window_; 37 aura::Window* window_;
38 38
39 // Not owned. 39 // Not owned.
40 ShelfModel* model_; 40 ShelfModel* model_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate); 42 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcherItemDelegate);
43 }; 43 };
44 44
45 } // namespace ash 45 } // namespace ash
46 46
47 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_ 47 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher.h ('k') | ash/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698