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

Side by Side Diff: ui/app_list/views/folder_background_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/app_list/views/contents_view.h ('k') | ui/app_list/views/folder_header_view.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_
6 #define UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_
7 7
8 #include "ui/compositor/layer_animation_observer.h" 8 #include "ui/compositor/layer_animation_observer.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 // Returns the radius of the folder container ink bubble. 32 // Returns the radius of the folder container ink bubble.
33 int GetFolderContainerBubbleRadius() const; 33 int GetFolderContainerBubbleRadius() const;
34 34
35 void set_folder_view(AppListFolderView* folder_view) { 35 void set_folder_view(AppListFolderView* folder_view) {
36 folder_view_ = folder_view; 36 folder_view_ = folder_view;
37 } 37 }
38 38
39 private: 39 private:
40 // views::View overrides: 40 // views::View overrides:
41 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 41 virtual void OnPaint(gfx::Canvas* canvas) override;
42 42
43 // ui::ImplicitAnimationObserver overrides: 43 // ui::ImplicitAnimationObserver overrides:
44 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 44 virtual void OnImplicitAnimationsCompleted() override;
45 45
46 AppListFolderView* folder_view_; 46 AppListFolderView* folder_view_;
47 ShowState show_state_; 47 ShowState show_state_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(FolderBackgroundView); 49 DISALLOW_COPY_AND_ASSIGN(FolderBackgroundView);
50 }; 50 };
51 51
52 } // namespace app_list 52 } // namespace app_list
53 53
54 #endif // UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_ 54 #endif // UI_APP_LIST_VIEWS_FOLDER_BACKGROUND_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/contents_view.h ('k') | ui/app_list/views/folder_header_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698