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

Side by Side Diff: ash/ash_touch_exploration_manager_chromeos.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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
OLDNEW
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 <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/system/tray_accessibility.h" 11 #include "ash/system/tray_accessibility.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "ui/chromeos/touch_exploration_controller.h" 13 #include "ui/chromeos/touch_exploration_controller.h"
12 14
13 namespace chromeos { 15 namespace chromeos {
14 class CrasAudioHandler; 16 class CrasAudioHandler;
15 } 17 }
16 18
17 namespace ash { 19 namespace ash {
(...skipping 20 matching lines...) Expand all
38 void SilenceSpokenFeedback() override; 40 void SilenceSpokenFeedback() override;
39 void PlayVolumeAdjustEarcon() override; 41 void PlayVolumeAdjustEarcon() override;
40 void PlayPassthroughEarcon() override; 42 void PlayPassthroughEarcon() override;
41 void PlayExitScreenEarcon() override; 43 void PlayExitScreenEarcon() override;
42 void PlayEnterScreenEarcon() override; 44 void PlayEnterScreenEarcon() override;
43 45
44 private: 46 private:
45 void UpdateTouchExplorationState(); 47 void UpdateTouchExplorationState();
46 bool VolumeAdjustSoundEnabled(); 48 bool VolumeAdjustSoundEnabled();
47 49
48 scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_; 50 std::unique_ptr<ui::TouchExplorationController> touch_exploration_controller_;
49 RootWindowController* root_window_controller_; 51 RootWindowController* root_window_controller_;
50 chromeos::CrasAudioHandler* audio_handler_; 52 chromeos::CrasAudioHandler* audio_handler_;
51 53
52 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager); 54 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager);
53 }; 55 };
54 56
55 } // namespace ash 57 } // namespace ash
56 58
57 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_ 59 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/accelerators/spoken_feedback_toggler_unittest.cc ('k') | ash/autoclick/autoclick_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698