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

Side by Side Diff: ios/chrome/browser/favicon/large_icon_cache.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "ios/chrome/browser/favicon/large_icon_cache.h" 5 #include "ios/chrome/browser/favicon/large_icon_cache.h"
6 6
7 #include "components/favicon_base/fallback_icon_style.h" 7 #include "components/favicon_base/fallback_icon_style.h"
8 #include "components/favicon_base/favicon_types.h" 8 #include "components/favicon_base/favicon_types.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 scoped_ptr<favicon_base::LargeIconResult> LargeIconCache::CloneLargeIconResult( 47 scoped_ptr<favicon_base::LargeIconResult> LargeIconCache::CloneLargeIconResult(
48 const favicon_base::LargeIconResult& large_icon_result) { 48 const favicon_base::LargeIconResult& large_icon_result) {
49 scoped_ptr<favicon_base::LargeIconResult> clone; 49 scoped_ptr<favicon_base::LargeIconResult> clone;
50 if (large_icon_result.bitmap.is_valid()) { 50 if (large_icon_result.bitmap.is_valid()) {
51 clone.reset(new favicon_base::LargeIconResult(large_icon_result.bitmap)); 51 clone.reset(new favicon_base::LargeIconResult(large_icon_result.bitmap));
52 } else { 52 } else {
53 clone.reset( 53 clone.reset(
54 new favicon_base::LargeIconResult(new favicon_base::FallbackIconStyle( 54 new favicon_base::LargeIconResult(new favicon_base::FallbackIconStyle(
55 *large_icon_result.fallback_icon_style.get()))); 55 *large_icon_result.fallback_icon_style.get())));
56 } 56 }
57 return clone.Pass(); 57 return clone;
58 } 58 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698