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

Side by Side Diff: ash/test/test_shelf_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/test/test_session_state_delegate.cc ('k') | ash/test/test_shelf_item_delegate.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_TEST_TEST_SHELF_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_
6 #define ASH_TEST_TEST_SHELF_DELEGATE_H_ 6 #define ASH_TEST_TEST_SHELF_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 14 matching lines...) Expand all
25 explicit TestShelfDelegate(ShelfModel* model); 25 explicit TestShelfDelegate(ShelfModel* model);
26 virtual ~TestShelfDelegate(); 26 virtual ~TestShelfDelegate();
27 27
28 void AddShelfItem(aura::Window* window); 28 void AddShelfItem(aura::Window* window);
29 void AddShelfItem(aura::Window* window, ShelfItemStatus status); 29 void AddShelfItem(aura::Window* window, ShelfItemStatus status);
30 void RemoveShelfItemForWindow(aura::Window* window); 30 void RemoveShelfItemForWindow(aura::Window* window);
31 31
32 static TestShelfDelegate* instance() { return instance_; } 32 static TestShelfDelegate* instance() { return instance_; }
33 33
34 // WindowObserver implementation 34 // WindowObserver implementation
35 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 35 virtual void OnWindowDestroying(aura::Window* window) override;
36 virtual void OnWindowHierarchyChanging( 36 virtual void OnWindowHierarchyChanging(
37 const HierarchyChangeParams& params) OVERRIDE; 37 const HierarchyChangeParams& params) override;
38 38
39 // ShelfDelegate implementation. 39 // ShelfDelegate implementation.
40 virtual void OnShelfCreated(Shelf* shelf) OVERRIDE; 40 virtual void OnShelfCreated(Shelf* shelf) override;
41 virtual void OnShelfDestroyed(Shelf* shelf) OVERRIDE; 41 virtual void OnShelfDestroyed(Shelf* shelf) override;
42 virtual ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE; 42 virtual ShelfID GetShelfIDForAppID(const std::string& app_id) override;
43 virtual const std::string& GetAppIDForShelfID(ShelfID id) OVERRIDE; 43 virtual const std::string& GetAppIDForShelfID(ShelfID id) override;
44 virtual void PinAppWithID(const std::string& app_id) OVERRIDE; 44 virtual void PinAppWithID(const std::string& app_id) override;
45 virtual bool CanPin() const OVERRIDE; 45 virtual bool CanPin() const override;
46 virtual bool IsAppPinned(const std::string& app_id) OVERRIDE; 46 virtual bool IsAppPinned(const std::string& app_id) override;
47 virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE; 47 virtual void UnpinAppWithID(const std::string& app_id) override;
48 48
49 private: 49 private:
50 static TestShelfDelegate* instance_; 50 static TestShelfDelegate* instance_;
51 51
52 ShelfModel* model_; 52 ShelfModel* model_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate); 54 DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
55 }; 55 };
56 56
57 } // namespace test 57 } // namespace test
58 } // namespace ash 58 } // namespace ash
59 59
60 #endif // ASH_TEST_TEST_SHELF_DELEGATE_H_ 60 #endif // ASH_TEST_TEST_SHELF_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_session_state_delegate.cc ('k') | ash/test/test_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698