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

Side by Side Diff: chrome/browser/ui/ash/launcher/launcher_favicon_loader.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "content/public/common/favicon_url.h" 13 #include "content/public/common/favicon_url.h"
14 14
15 class GURL; 15 class GURL;
16 class SkBitmap; 16 class SkBitmap;
17 17
18 namespace internal { 18 namespace internal {
19 class FaviconRawBitmapHandler; 19 class FaviconRawBitmapHandler;
20 } 20 }
21 21
22 namespace content { 22 namespace content {
(...skipping 23 matching lines...) Expand all
46 46
47 // Returns an appropriately sized favicon for the Launcher. If none are 47 // Returns an appropriately sized favicon for the Launcher. If none are
48 // available will return an isNull bitmap. 48 // available will return an isNull bitmap.
49 SkBitmap GetFavicon() const; 49 SkBitmap GetFavicon() const;
50 50
51 // Returns true if the loader is waiting for downloads to finish. 51 // Returns true if the loader is waiting for downloads to finish.
52 bool HasPendingDownloads() const; 52 bool HasPendingDownloads() const;
53 53
54 private: 54 private:
55 content::WebContents* web_contents_; 55 content::WebContents* web_contents_;
56 scoped_ptr<internal::FaviconRawBitmapHandler> favicon_handler_; 56 std::unique_ptr<internal::FaviconRawBitmapHandler> favicon_handler_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(LauncherFaviconLoader); 58 DISALLOW_COPY_AND_ASSIGN(LauncherFaviconLoader);
59 }; 59 };
60 60
61 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_ 61 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_FAVICON_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698