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

Side by Side Diff: chrome/browser/ui/toolbar/app_menu_icon_painter.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_TOOLBAR_APP_MENU_ICON_PAINTER_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_
7 7
8 #include <memory>
9
8 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/gfx/animation/animation_delegate.h" 12 #include "ui/gfx/animation/animation_delegate.h"
12 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class Canvas; 16 class Canvas;
16 class MultiAnimation; 17 class MultiAnimation;
17 class Rect; 18 class Rect;
18 } 19 }
19 namespace ui { 20 namespace ui {
20 class ThemeProvider; 21 class ThemeProvider;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 66
66 // AnimationDelegate: 67 // AnimationDelegate:
67 void AnimationProgressed(const gfx::Animation* animation) override; 68 void AnimationProgressed(const gfx::Animation* animation) override;
68 69
69 // Gets the image ID used to draw bars for the current severity level. 70 // Gets the image ID used to draw bars for the current severity level.
70 int GetCurrentSeverityImageID() const; 71 int GetCurrentSeverityImageID() const;
71 72
72 Delegate* delegate_; 73 Delegate* delegate_;
73 Severity severity_; 74 Severity severity_;
74 gfx::ImageSkia badge_; 75 gfx::ImageSkia badge_;
75 scoped_ptr<gfx::MultiAnimation> animation_; 76 std::unique_ptr<gfx::MultiAnimation> animation_;
76 77
77 DISALLOW_COPY_AND_ASSIGN(AppMenuIconPainter); 78 DISALLOW_COPY_AND_ASSIGN(AppMenuIconPainter);
78 }; 79 };
79 80
80 #endif // CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_ 81 #endif // CHROME_BROWSER_UI_TOOLBAR_APP_MENU_ICON_PAINTER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/tests/ui_gfx_image_unittest.cc ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698