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

Side by Side Diff: ui/app_list/views/search_result_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/search_result_list_view_unittest.cc ('k') | ui/app_list/views/speech_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SEARCH_RESULT_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // Clears the selected action. 59 // Clears the selected action.
60 void ClearSelectedAction(); 60 void ClearSelectedAction();
61 61
62 private: 62 private:
63 friend class app_list::test::SearchResultListViewTest; 63 friend class app_list::test::SearchResultListViewTest;
64 64
65 void UpdateTitleText(); 65 void UpdateTitleText();
66 void UpdateDetailsText(); 66 void UpdateDetailsText();
67 67
68 // views::View overrides: 68 // views::View overrides:
69 virtual const char* GetClassName() const OVERRIDE; 69 virtual const char* GetClassName() const override;
70 virtual gfx::Size GetPreferredSize() const OVERRIDE; 70 virtual gfx::Size GetPreferredSize() const override;
71 virtual void Layout() OVERRIDE; 71 virtual void Layout() override;
72 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 72 virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
73 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 73 virtual void ChildPreferredSizeChanged(views::View* child) override;
74 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 74 virtual void OnPaint(gfx::Canvas* canvas) override;
75 75
76 // views::ButtonListener overrides: 76 // views::ButtonListener overrides:
77 virtual void ButtonPressed(views::Button* sender, 77 virtual void ButtonPressed(views::Button* sender,
78 const ui::Event& event) OVERRIDE; 78 const ui::Event& event) override;
79 79
80 // views::ContextMenuController overrides: 80 // views::ContextMenuController overrides:
81 virtual void ShowContextMenuForView(views::View* source, 81 virtual void ShowContextMenuForView(views::View* source,
82 const gfx::Point& point, 82 const gfx::Point& point,
83 ui::MenuSourceType source_type) OVERRIDE; 83 ui::MenuSourceType source_type) override;
84 84
85 // SearchResultObserver overrides: 85 // SearchResultObserver overrides:
86 virtual void OnIconChanged() OVERRIDE; 86 virtual void OnIconChanged() override;
87 virtual void OnActionsChanged() OVERRIDE; 87 virtual void OnActionsChanged() override;
88 virtual void OnIsInstallingChanged() OVERRIDE; 88 virtual void OnIsInstallingChanged() override;
89 virtual void OnPercentDownloadedChanged() OVERRIDE; 89 virtual void OnPercentDownloadedChanged() override;
90 virtual void OnItemInstalled() OVERRIDE; 90 virtual void OnItemInstalled() override;
91 virtual void OnItemUninstalled() OVERRIDE; 91 virtual void OnItemUninstalled() override;
92 92
93 // SearchResultActionsViewDelegate overrides: 93 // SearchResultActionsViewDelegate overrides:
94 virtual void OnSearchResultActionActivated(size_t index, 94 virtual void OnSearchResultActionActivated(size_t index,
95 int event_flags) OVERRIDE; 95 int event_flags) override;
96 96
97 SearchResult* result_; // Owned by AppListModel::SearchResults. 97 SearchResult* result_; // Owned by AppListModel::SearchResults.
98 98
99 // Parent list view. Owned by views hierarchy. 99 // Parent list view. Owned by views hierarchy.
100 SearchResultListView* list_view_; 100 SearchResultListView* list_view_;
101 101
102 views::ImageView* icon_; // Owned by views hierarchy. 102 views::ImageView* icon_; // Owned by views hierarchy.
103 scoped_ptr<gfx::RenderText> title_text_; 103 scoped_ptr<gfx::RenderText> title_text_;
104 scoped_ptr<gfx::RenderText> details_text_; 104 scoped_ptr<gfx::RenderText> details_text_;
105 SearchResultActionsView* actions_view_; // Owned by the views hierarchy. 105 SearchResultActionsView* actions_view_; // Owned by the views hierarchy.
106 ProgressBarView* progress_bar_; // Owned by views hierarchy. 106 ProgressBarView* progress_bar_; // Owned by views hierarchy.
107 107
108 scoped_ptr<views::MenuRunner> context_menu_runner_; 108 scoped_ptr<views::MenuRunner> context_menu_runner_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(SearchResultView); 110 DISALLOW_COPY_AND_ASSIGN(SearchResultView);
111 }; 111 };
112 112
113 } // namespace app_list 113 } // namespace app_list
114 114
115 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_ 115 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_list_view_unittest.cc ('k') | ui/app_list/views/speech_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698