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

Side by Side Diff: ui/app_list/views/apps_container_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/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_grid_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 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 UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "ui/app_list/app_list_folder_item.h" 10 #include "ui/app_list/app_list_folder_item.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ApplicationDragAndDropHost* drag_and_drop_host); 51 ApplicationDragAndDropHost* drag_and_drop_host);
52 52
53 // Transits the UI from folder view to root lelve apps grid view when 53 // Transits the UI from folder view to root lelve apps grid view when
54 // re-parenting a child item of |folder_item|. 54 // re-parenting a child item of |folder_item|.
55 void ReparentFolderItemTransit(AppListFolderItem* folder_item); 55 void ReparentFolderItemTransit(AppListFolderItem* folder_item);
56 56
57 // Returns true if it is currently showing an active folder page. 57 // Returns true if it is currently showing an active folder page.
58 bool IsInFolderView() const; 58 bool IsInFolderView() const;
59 59
60 // views::View overrides: 60 // views::View overrides:
61 virtual gfx::Size GetPreferredSize() const OVERRIDE; 61 virtual gfx::Size GetPreferredSize() const override;
62 virtual void Layout() OVERRIDE; 62 virtual void Layout() override;
63 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 63 virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
64 64
65 // TopIconAnimationObserver overrides: 65 // TopIconAnimationObserver overrides:
66 virtual void OnTopIconAnimationsComplete() OVERRIDE; 66 virtual void OnTopIconAnimationsComplete() override;
67 67
68 AppsGridView* apps_grid_view() { return apps_grid_view_; } 68 AppsGridView* apps_grid_view() { return apps_grid_view_; }
69 FolderBackgroundView* folder_background_view() { 69 FolderBackgroundView* folder_background_view() {
70 return folder_background_view_; 70 return folder_background_view_;
71 } 71 }
72 AppListFolderView* app_list_folder_view() { return app_list_folder_view_; } 72 AppListFolderView* app_list_folder_view() { return app_list_folder_view_; }
73 73
74 private: 74 private:
75 enum ShowState { 75 enum ShowState {
76 SHOW_NONE, // initial state 76 SHOW_NONE, // initial state
(...skipping 29 matching lines...) Expand all
106 106
107 size_t top_icon_animation_pending_count_; 107 size_t top_icon_animation_pending_count_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(AppsContainerView); 109 DISALLOW_COPY_AND_ASSIGN(AppsContainerView);
110 }; 110 };
111 111
112 } // namespace app_list 112 } // namespace app_list
113 113
114 114
115 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_ 115 #endif // UI_APP_LIST_VIEWS_APPS_CONTAINER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view_unittest.cc ('k') | ui/app_list/views/apps_grid_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698