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

Side by Side Diff: ui/app_list/views/app_list_main_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_item_view.h ('k') | ui/app_list/views/app_list_main_view.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 UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
6 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // |parent| is used to determine the image scale factor to use. 90 // |parent| is used to determine the image scale factor to use.
91 void PreloadIcons(gfx::NativeView parent); 91 void PreloadIcons(gfx::NativeView parent);
92 92
93 // Invoked when |icon_loading_wait_timer_| fires. 93 // Invoked when |icon_loading_wait_timer_| fires.
94 void OnIconLoadingWaitTimer(); 94 void OnIconLoadingWaitTimer();
95 95
96 // Invoked from an IconLoader when icon loading is finished. 96 // Invoked from an IconLoader when icon loading is finished.
97 void OnItemIconLoaded(IconLoader* loader); 97 void OnItemIconLoaded(IconLoader* loader);
98 98
99 // Overridden from AppsGridViewDelegate: 99 // Overridden from AppsGridViewDelegate:
100 virtual void ActivateApp(AppListItem* item, int event_flags) OVERRIDE; 100 virtual void ActivateApp(AppListItem* item, int event_flags) override;
101 virtual void GetShortcutPathForApp( 101 virtual void GetShortcutPathForApp(
102 const std::string& app_id, 102 const std::string& app_id,
103 const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE; 103 const base::Callback<void(const base::FilePath&)>& callback) override;
104 virtual void CancelDragInActiveFolder() OVERRIDE; 104 virtual void CancelDragInActiveFolder() override;
105 105
106 // Overridden from SearchBoxViewDelegate: 106 // Overridden from SearchBoxViewDelegate:
107 virtual void QueryChanged(SearchBoxView* sender) OVERRIDE; 107 virtual void QueryChanged(SearchBoxView* sender) override;
108 108
109 // Overridden from SearchResultListViewDelegate: 109 // Overridden from SearchResultListViewDelegate:
110 virtual void OnResultInstalled(SearchResult* result) OVERRIDE; 110 virtual void OnResultInstalled(SearchResult* result) override;
111 virtual void OnResultUninstalled(SearchResult* result) OVERRIDE; 111 virtual void OnResultUninstalled(SearchResult* result) override;
112 112
113 AppListViewDelegate* delegate_; // Owned by parent view (AppListView). 113 AppListViewDelegate* delegate_; // Owned by parent view (AppListView).
114 AppListModel* model_; // Unowned; ownership is handled by |delegate_|. 114 AppListModel* model_; // Unowned; ownership is handled by |delegate_|.
115 115
116 SearchBoxView* search_box_view_; // Owned by views hierarchy. 116 SearchBoxView* search_box_view_; // Owned by views hierarchy.
117 ContentsView* contents_view_; // Owned by views hierarchy. 117 ContentsView* contents_view_; // Owned by views hierarchy.
118 118
119 // Owned by views hierarchy. NULL in the non-experimental app list. 119 // Owned by views hierarchy. NULL in the non-experimental app list.
120 ContentsSwitcherView* contents_switcher_view_; 120 ContentsSwitcherView* contents_switcher_view_;
121 121
122 // A timer that fires when maximum allowed time to wait for icon loading has 122 // A timer that fires when maximum allowed time to wait for icon loading has
123 // passed. 123 // passed.
124 base::OneShotTimer<AppListMainView> icon_loading_wait_timer_; 124 base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;
125 125
126 ScopedVector<IconLoader> pending_icon_loaders_; 126 ScopedVector<IconLoader> pending_icon_loaders_;
127 127
128 base::WeakPtrFactory<AppListMainView> weak_ptr_factory_; 128 base::WeakPtrFactory<AppListMainView> weak_ptr_factory_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(AppListMainView); 130 DISALLOW_COPY_AND_ASSIGN(AppListMainView);
131 }; 131 };
132 132
133 } // namespace app_list 133 } // namespace app_list
134 134
135 #endif // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_ 135 #endif // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_item_view.h ('k') | ui/app_list/views/app_list_main_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698