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

Side by Side Diff: ui/app_list/views/speech_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_view.h ('k') | ui/app_list/views/speech_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_SPEECH_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SPEECH_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SPEECH_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SPEECH_VIEW_H_
7 7
8 #include "ui/app_list/app_list_export.h" 8 #include "ui/app_list/app_list_export.h"
9 #include "ui/app_list/speech_ui_model_observer.h" 9 #include "ui/app_list/speech_ui_model_observer.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 16 matching lines...) Expand all
27 public views::ButtonListener, 27 public views::ButtonListener,
28 public SpeechUIModelObserver { 28 public SpeechUIModelObserver {
29 public: 29 public:
30 explicit SpeechView(AppListViewDelegate* delegate); 30 explicit SpeechView(AppListViewDelegate* delegate);
31 virtual ~SpeechView(); 31 virtual ~SpeechView();
32 32
33 // Reset to the original state. 33 // Reset to the original state.
34 void Reset(); 34 void Reset();
35 35
36 // Overridden from views::View: 36 // Overridden from views::View:
37 virtual void Layout() OVERRIDE; 37 virtual void Layout() override;
38 virtual gfx::Size GetPreferredSize() const OVERRIDE; 38 virtual gfx::Size GetPreferredSize() const override;
39 39
40 views::ImageButton* mic_button() { return mic_button_; } 40 views::ImageButton* mic_button() { return mic_button_; }
41 41
42 private: 42 private:
43 int GetIndicatorRadius(uint8 level); 43 int GetIndicatorRadius(uint8 level);
44 44
45 // Overridden from views::ButtonListener: 45 // Overridden from views::ButtonListener:
46 virtual void ButtonPressed(views::Button* sender, 46 virtual void ButtonPressed(views::Button* sender,
47 const ui::Event& event) OVERRIDE; 47 const ui::Event& event) override;
48 48
49 // Overridden from SpeechUIModelObserver: 49 // Overridden from SpeechUIModelObserver:
50 virtual void OnSpeechSoundLevelChanged(uint8 level) OVERRIDE; 50 virtual void OnSpeechSoundLevelChanged(uint8 level) override;
51 virtual void OnSpeechResult(const base::string16& result, 51 virtual void OnSpeechResult(const base::string16& result,
52 bool is_final) OVERRIDE; 52 bool is_final) override;
53 virtual void OnSpeechRecognitionStateChanged( 53 virtual void OnSpeechRecognitionStateChanged(
54 SpeechRecognitionState new_state) OVERRIDE; 54 SpeechRecognitionState new_state) override;
55 55
56 AppListViewDelegate* delegate_; 56 AppListViewDelegate* delegate_;
57 57
58 views::ImageView* logo_; 58 views::ImageView* logo_;
59 views::View* indicator_; 59 views::View* indicator_;
60 views::ImageButton* mic_button_; 60 views::ImageButton* mic_button_;
61 views::Label* speech_result_; 61 views::Label* speech_result_;
62 scoped_ptr<views::BoundsAnimator> indicator_animator_; 62 scoped_ptr<views::BoundsAnimator> indicator_animator_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(SpeechView); 64 DISALLOW_COPY_AND_ASSIGN(SpeechView);
65 }; 65 };
66 66
67 } // namespace app_list 67 } // namespace app_list
68 68
69 #endif // UI_APP_LIST_VIEWS_SPEECH_VIEW_H_ 69 #endif // UI_APP_LIST_VIEWS_SPEECH_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_view.h ('k') | ui/app_list/views/speech_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698