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

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: 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
oshima 2016/04/08 07:09:39 include?
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 "base/macros.h" 10 #include "base/macros.h"
11 #include "ui/chromeos/touch_exploration_controller.h" 11 #include "ui/chromeos/touch_exploration_controller.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 class CrasAudioHandler; 14 class CrasAudioHandler;
15 } 15 }
16 16
17 namespace ash { 17 namespace ash {
(...skipping 20 matching lines...) Expand all
38 void SilenceSpokenFeedback() override; 38 void SilenceSpokenFeedback() override;
39 void PlayVolumeAdjustEarcon() override; 39 void PlayVolumeAdjustEarcon() override;
40 void PlayPassthroughEarcon() override; 40 void PlayPassthroughEarcon() override;
41 void PlayExitScreenEarcon() override; 41 void PlayExitScreenEarcon() override;
42 void PlayEnterScreenEarcon() override; 42 void PlayEnterScreenEarcon() override;
43 43
44 private: 44 private:
45 void UpdateTouchExplorationState(); 45 void UpdateTouchExplorationState();
46 bool VolumeAdjustSoundEnabled(); 46 bool VolumeAdjustSoundEnabled();
47 47
48 scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_; 48 std::unique_ptr<ui::TouchExplorationController> touch_exploration_controller_;
49 RootWindowController* root_window_controller_; 49 RootWindowController* root_window_controller_;
50 chromeos::CrasAudioHandler* audio_handler_; 50 chromeos::CrasAudioHandler* audio_handler_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager); 52 DISALLOW_COPY_AND_ASSIGN(AshTouchExplorationManager);
53 }; 53 };
54 54
55 } // namespace ash 55 } // namespace ash
56 56
57 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_ 57 #endif // ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698