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

Side by Side Diff: ui/app_list/views/search_box_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/pulsing_block_view.h ('k') | ui/app_list/views/search_box_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 (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_BOX_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/app_list/search_box_model_observer.h" 10 #include "ui/app_list/search_box_model_observer.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 void ClearSearch(); 48 void ClearSearch();
49 void InvalidateMenu(); 49 void InvalidateMenu();
50 50
51 views::Textfield* search_box() { return search_box_; } 51 views::Textfield* search_box() { return search_box_; }
52 52
53 void set_contents_view(views::View* contents_view) { 53 void set_contents_view(views::View* contents_view) {
54 contents_view_ = contents_view; 54 contents_view_ = contents_view;
55 } 55 }
56 56
57 // Overridden from views::View: 57 // Overridden from views::View:
58 virtual gfx::Size GetPreferredSize() const OVERRIDE; 58 virtual gfx::Size GetPreferredSize() const override;
59 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; 59 virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override;
60 60
61 private: 61 private:
62 // Updates model text and selection model with current Textfield info. 62 // Updates model text and selection model with current Textfield info.
63 void UpdateModel(); 63 void UpdateModel();
64 64
65 // Fires query change notification. 65 // Fires query change notification.
66 void NotifyQueryChanged(); 66 void NotifyQueryChanged();
67 67
68 // Overridden from views::TextfieldController: 68 // Overridden from views::TextfieldController:
69 virtual void ContentsChanged(views::Textfield* sender, 69 virtual void ContentsChanged(views::Textfield* sender,
70 const base::string16& new_contents) OVERRIDE; 70 const base::string16& new_contents) override;
71 virtual bool HandleKeyEvent(views::Textfield* sender, 71 virtual bool HandleKeyEvent(views::Textfield* sender,
72 const ui::KeyEvent& key_event) OVERRIDE; 72 const ui::KeyEvent& key_event) override;
73 73
74 // Overridden from views::ButtonListener: 74 // Overridden from views::ButtonListener:
75 virtual void ButtonPressed(views::Button* sender, 75 virtual void ButtonPressed(views::Button* sender,
76 const ui::Event& event) OVERRIDE; 76 const ui::Event& event) override;
77 77
78 // Overridden from views::MenuButtonListener: 78 // Overridden from views::MenuButtonListener:
79 virtual void OnMenuButtonClicked(View* source, 79 virtual void OnMenuButtonClicked(View* source,
80 const gfx::Point& point) OVERRIDE; 80 const gfx::Point& point) override;
81 81
82 // Overridden from SearchBoxModelObserver: 82 // Overridden from SearchBoxModelObserver:
83 virtual void IconChanged() OVERRIDE; 83 virtual void IconChanged() override;
84 virtual void SpeechRecognitionButtonPropChanged() OVERRIDE; 84 virtual void SpeechRecognitionButtonPropChanged() override;
85 virtual void HintTextChanged() OVERRIDE; 85 virtual void HintTextChanged() override;
86 virtual void SelectionModelChanged() OVERRIDE; 86 virtual void SelectionModelChanged() override;
87 virtual void TextChanged() OVERRIDE; 87 virtual void TextChanged() override;
88 88
89 // Overridden from SpeechUIModelObserver: 89 // Overridden from SpeechUIModelObserver:
90 virtual void OnSpeechRecognitionStateChanged( 90 virtual void OnSpeechRecognitionStateChanged(
91 SpeechRecognitionState new_state) OVERRIDE; 91 SpeechRecognitionState new_state) override;
92 92
93 SearchBoxViewDelegate* delegate_; // Not owned. 93 SearchBoxViewDelegate* delegate_; // Not owned.
94 AppListViewDelegate* view_delegate_; // Not owned. 94 AppListViewDelegate* view_delegate_; // Not owned.
95 AppListModel* model_; // Owned by the profile-keyed service. 95 AppListModel* model_; // Owned by the profile-keyed service.
96 96
97 scoped_ptr<AppListMenuViews> menu_; 97 scoped_ptr<AppListMenuViews> menu_;
98 98
99 views::ImageView* icon_view_; // Owned by views hierarchy. 99 views::ImageView* icon_view_; // Owned by views hierarchy.
100 views::ImageButton* speech_button_; // Owned by views hierarchy. 100 views::ImageButton* speech_button_; // Owned by views hierarchy.
101 views::MenuButton* menu_button_; // Owned by views hierarchy. 101 views::MenuButton* menu_button_; // Owned by views hierarchy.
102 views::Textfield* search_box_; // Owned by views hierarchy. 102 views::Textfield* search_box_; // Owned by views hierarchy.
103 views::View* contents_view_; // Owned by views hierarchy. 103 views::View* contents_view_; // Owned by views hierarchy.
104 104
105 DISALLOW_COPY_AND_ASSIGN(SearchBoxView); 105 DISALLOW_COPY_AND_ASSIGN(SearchBoxView);
106 }; 106 };
107 107
108 } // namespace app_list 108 } // namespace app_list
109 109
110 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_ 110 #endif // UI_APP_LIST_VIEWS_SEARCH_BOX_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/pulsing_block_view.h ('k') | ui/app_list/views/search_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698