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

Side by Side Diff: ash/shell/shelf_delegate_impl.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/panel_window.h ('k') | ash/shell/shell_delegate_impl.h » ('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_SHELF_DELEGATE_IMPL_H_ 5 #ifndef ASH_SHELL_SHELF_DELEGATE_IMPL_H_
6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_ 6 #define ASH_SHELL_SHELF_DELEGATE_IMPL_H_
7 7
8 #include "ash/shelf/shelf_delegate.h" 8 #include "ash/shelf/shelf_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 10
11 namespace aura { 11 namespace aura {
12 class Window; 12 class Window;
13 } 13 }
14 14
15 namespace ash { 15 namespace ash {
16 namespace shell { 16 namespace shell {
17 17
18 class WindowWatcher; 18 class WindowWatcher;
19 19
20 class ShelfDelegateImpl : public ShelfDelegate { 20 class ShelfDelegateImpl : public ShelfDelegate {
21 public: 21 public:
22 explicit ShelfDelegateImpl(WindowWatcher* watcher); 22 explicit ShelfDelegateImpl(WindowWatcher* watcher);
23 virtual ~ShelfDelegateImpl(); 23 virtual ~ShelfDelegateImpl();
24 24
25 void set_watcher(WindowWatcher* watcher) { watcher_ = watcher; } 25 void set_watcher(WindowWatcher* watcher) { watcher_ = watcher; }
26 26
27 // ShelfDelegate overrides: 27 // ShelfDelegate overrides:
28 virtual void OnShelfCreated(Shelf* shelf) OVERRIDE; 28 virtual void OnShelfCreated(Shelf* shelf) override;
29 virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE; 29 virtual void OnShelfDestroyed(Shelf* shelf) override;
30 virtual ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE; 30 virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override;
31 virtual const std::string& GetAppIDForShelfID(ShelfID id) OVERRIDE; 31 virtual const std::string& GetAppIDForShelfID(ShelfID id) override;
32 virtual void PinAppWithID(const std::string& app_id) OVERRIDE; 32 virtual void PinAppWithID(const std::string& app_id) override;
33 virtual bool IsAppPinned(const std::string& app_id) OVERRIDE; 33 virtual bool IsAppPinned(const std::string& app_id) override;
34 virtual bool CanPin() const OVERRIDE; 34 virtual bool CanPin() const override;
35 virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE; 35 virtual void UnpinAppWithID(const std::string& app_id) override;
36 36
37 private: 37 private:
38 // Used to update Launcher. Owned by main. 38 // Used to update Launcher. Owned by main.
39 WindowWatcher* watcher_; 39 WindowWatcher* watcher_;
40 40
41 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl); 41 DISALLOW_COPY_AND_ASSIGN(ShelfDelegateImpl);
42 }; 42 };
43 43
44 } // namespace shell 44 } // namespace shell
45 } // namespace ash 45 } // namespace ash
46 46
47 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_ 47 #endif // ASH_SHELL_SHELF_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/panel_window.h ('k') | ash/shell/shell_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698