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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/elevation_icon_setter.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc ('k') | chrome/browser/ui/views/frame/browser_window_property_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/elevation_icon_setter.cc
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc
index 1548025c654904b100104a11cc8f8228bd0bb98f..877ff9a32480fbac0e9fc1c34f71d20f31967509 100644
--- a/chrome/browser/ui/views/elevation_icon_setter.cc
+++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -29,7 +29,7 @@ scoped_ptr<SkBitmap> GetElevationIcon() {
#if defined(OS_WIN)
if ((base::win::GetVersion() < base::win::VERSION_VISTA) ||
!base::win::UserAccountControlIsEnabled())
- return icon.Pass();
+ return icon;
SHSTOCKICONINFO icon_info = { sizeof(SHSTOCKICONINFO) };
typedef HRESULT (STDAPICALLTYPE *GetStockIconInfo)(SHSTOCKICONID,
@@ -43,7 +43,7 @@ scoped_ptr<SkBitmap> GetElevationIcon() {
// TODO(pkasting): Run on a background thread since this call spins a nested
// message loop.
if (FAILED((*func)(SIID_SHIELD, SHGSI_ICON | SHGSI_SMALLICON, &icon_info)))
- return icon.Pass();
+ return icon;
icon.reset(IconUtil::CreateSkBitmapFromHICON(
icon_info.hIcon,
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc ('k') | chrome/browser/ui/views/frame/browser_window_property_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698