ash/ash_touch_exploration_manager_chromeos.h - Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/

Side by Side Diff: ash/ash_touch_exploration_manager_chromeos.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « ash/accelerometer/accelerometer_controller.h ('k') | ash/autoclick/autoclick_controller.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_	5 #ifndef ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_

6 #define ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_	6 #define ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/system/tray_accessibility.h"	9 #include "ash/system/tray_accessibility.h"

10 #include "ui/chromeos/touch_exploration_controller.h"	10 #include "ui/chromeos/touch_exploration_controller.h"

(...skipping 12 matching lines...) Expand all Loading...
23 class ASH_EXPORT AshTouchExplorationManager	23 class ASH_EXPORT AshTouchExplorationManager

24 : public ash::AccessibilityObserver,	24 : public ash::AccessibilityObserver,

25 public ui::TouchExplorationControllerDelegate {	25 public ui::TouchExplorationControllerDelegate {

26 public:	26 public:

27 explicit AshTouchExplorationManager(	27 explicit AshTouchExplorationManager(

28 RootWindowController* root_window_controller);	28 RootWindowController* root_window_controller);

29 virtual ~AshTouchExplorationManager();	29 virtual ~AshTouchExplorationManager();

30	30

31 // AccessibilityObserver overrides:	31 // AccessibilityObserver overrides:

32 virtual void OnAccessibilityModeChanged(	32 virtual void OnAccessibilityModeChanged(

33 AccessibilityNotificationVisibility notify) OVERRIDE;	33 AccessibilityNotificationVisibility notify) override;

34	34

35 // TouchExplorationControllerDelegate overrides:	35 // TouchExplorationControllerDelegate overrides:

36 virtual void SetOutputLevel(int volume) OVERRIDE;	36 virtual void SetOutputLevel(int volume) override;

37 virtual void SilenceSpokenFeedback() OVERRIDE;	37 virtual void SilenceSpokenFeedback() override;

38 virtual void PlayVolumeAdjustEarcon() OVERRIDE;	38 virtual void PlayVolumeAdjustEarcon() override;

39 virtual void PlayPassthroughEarcon() OVERRIDE;	39 virtual void PlayPassthroughEarcon() override;

40 virtual void PlayExitScreenEarcon() OVERRIDE;	40 virtual void PlayExitScreenEarcon() override;

41 virtual void PlayEnterScreenEarcon() OVERRIDE;	41 virtual void PlayEnterScreenEarcon() override;

42	42

43 private:	43 private:

44 void UpdateTouchExplorationState();	44 void UpdateTouchExplorationState();

45 bool VolumeAdjustSoundEnabled();	45 bool VolumeAdjustSoundEnabled();

46	46

47 scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_;	47 scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_;

48 RootWindowController* root_window_controller_;	48 RootWindowController* root_window_controller_;

49 chromeos::CrasAudioHandler* audio_handler_;	49 chromeos::CrasAudioHandler* audio_handler_;

50	50

51 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager);	51 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager);

52 };	52 };

53	53

54 } // namespace ash	54 } // namespace ash

55	55

56 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_	56 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_

OLD	NEW