diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:24:41 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 05:24:41 +0000 |
| commit | d2ffcd5f6637ed3671320471c02d4b6c4cc020d7 (patch) | |
| tree | b994d970c02e9b1c11e6d372eacbdd38ad532a5a /chrome/browser/chrome_browser_main_extra_parts_aura.cc | |
| parent | 3b67546f8f00187780a5e9c4200978d09dff1e16 (diff) | |
| download | chromium_src-d2ffcd5f6637ed3671320471c02d4b6c4cc020d7.zip chromium_src-d2ffcd5f6637ed3671320471c02d4b6c4cc020d7.tar.gz chromium_src-d2ffcd5f6637ed3671320471c02d4b6c4cc020d7.tar.bz2 | |
Change the signature of SetScreenshotDelegate() to show ownership transfer more clearly.
BUG=None
TEST=ran aura_shell_unittests
Review URL: http://codereview.chromium.org/9240002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_extra_parts_aura.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_extra_parts_aura.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc index fca6812..f186ca0 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -43,8 +43,8 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() { // Shell takes ownership of ChromeShellDelegate. ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate); - // AcceleratorController takes ownership of ScreenshotDelegate. - shell->accelerator_controller()->SetScreenshotDelegate(new ScreenshotTaker); + shell->accelerator_controller()->SetScreenshotDelegate( + scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass()); // Make sure the singleton ScreenOrientationListener object is created. ScreenOrientationListener::GetInstance(); |