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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index db3fad2aa3425ae0850758bf8cd4499d7f686240..330eb25e35761b70f1be0a0132461a15297e0dea 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -70,7 +70,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
shell->accelerator_controller()->SetScreenshotDelegate(
- scoped_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));
+ std::unique_ptr<ash::ScreenshotDelegate>(new ChromeScreenshotGrabber));
#if defined(OS_CHROMEOS)
// TODO(flackr): Investigate exposing a blocking pool task runner to chromeos.
chromeos::AccelerometerReader::GetInstance()->Initialize(
@@ -79,7 +79,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
content::BrowserThread::GetBlockingPool()->GetSequenceToken(),
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
shell->accelerator_controller()->SetImeControlDelegate(
- scoped_ptr<ash::ImeControlDelegate>(new ImeController));
+ std::unique_ptr<ash::ImeControlDelegate>(new ImeController));
shell->high_contrast_controller()->SetEnabled(
chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_service_ash.h ('k') | chrome/browser/ui/ash/cast_config_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698