ash/ash_touch_exploration_manager_chromeos.h - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: ash/ash_touch_exploration_manager_chromeos.h

diff --git a/ash/ash_touch_exploration_manager_chromeos.h b/ash/ash_touch_exploration_manager_chromeos.h

index 95ae48755f5d1e431fcbb9397b86714f5064b723..1c2288c93f5db8335dddf99a693f0dc4cafeb721 100644

--- a/ash/ash_touch_exploration_manager_chromeos.h

+++ b/ash/ash_touch_exploration_manager_chromeos.h

@@ -5,6 +5,8 @@

#ifndef ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_

#define ASH_TOUCH_EXPLORATION_MANAGER_CHROMEOS_H_

+#include <memory>

#include "ash/ash_export.h"

#include "ash/system/tray_accessibility.h"

#include "base/macros.h"

@@ -45,7 +47,7 @@ class ASH_EXPORT AshTouchExplorationManager

void UpdateTouchExplorationState();

bool VolumeAdjustSoundEnabled();

- scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_;

+ std::unique_ptr<ui::TouchExplorationController> touch_exploration_controller_;

RootWindowController* root_window_controller_;

chromeos::CrasAudioHandler* audio_handler_;