| Index: ui/app_list/views/speech_view.h
|
| diff --git a/ui/app_list/views/speech_view.h b/ui/app_list/views/speech_view.h
|
| index d0d9cf6bacdad6af5d65208c5f970b226a0aae23..ebb320bd91704e9069403ccf085920dd7d1288e4 100644
|
| --- a/ui/app_list/views/speech_view.h
|
| +++ b/ui/app_list/views/speech_view.h
|
| @@ -28,14 +28,14 @@ class APP_LIST_EXPORT SpeechView : public views::View,
|
| public SpeechUIModelObserver {
|
| public:
|
| explicit SpeechView(AppListViewDelegate* delegate);
|
| - virtual ~SpeechView();
|
| + ~SpeechView() override;
|
|
|
| // Reset to the original state.
|
| void Reset();
|
|
|
| // Overridden from views::View:
|
| - virtual void Layout() override;
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
|
|
| views::ImageButton* mic_button() { return mic_button_; }
|
|
|
| @@ -43,14 +43,12 @@ class APP_LIST_EXPORT SpeechView : public views::View,
|
| int GetIndicatorRadius(uint8 level);
|
|
|
| // Overridden from views::ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // Overridden from SpeechUIModelObserver:
|
| - virtual void OnSpeechSoundLevelChanged(uint8 level) override;
|
| - virtual void OnSpeechResult(const base::string16& result,
|
| - bool is_final) override;
|
| - virtual void OnSpeechRecognitionStateChanged(
|
| + void OnSpeechSoundLevelChanged(uint8 level) override;
|
| + void OnSpeechResult(const base::string16& result, bool is_final) override;
|
| + void OnSpeechRecognitionStateChanged(
|
| SpeechRecognitionState new_state) override;
|
|
|
| AppListViewDelegate* delegate_;
|
|
|