Chromium Code Reviews| Index: chrome/browser/status_icons/status_tray.h |
| diff --git a/chrome/browser/status_icons/status_tray.h b/chrome/browser/status_icons/status_tray.h |
| index a5a21dc28a4c16c4b96108cb5ef0029b16e783e2..8f7a3398e9f554b4bc65f0a3577f2baadff2b2f5 100644 |
| --- a/chrome/browser/status_icons/status_tray.h |
| +++ b/chrome/browser/status_icons/status_tray.h |
| @@ -5,8 +5,10 @@ |
| #ifndef CHROME_BROWSER_STATUS_ICONS_STATUS_TRAY_H_ |
| #define CHROME_BROWSER_STATUS_ICONS_STATUS_TRAY_H_ |
| +#include <memory> |
| +#include <vector> |
| + |
| #include "base/macros.h" |
| -#include "base/memory/scoped_vector.h" |
| #include "base/strings/string16.h" |
| namespace gfx { |
| @@ -44,12 +46,12 @@ class StatusTray { |
| void RemoveStatusIcon(StatusIcon* icon); |
| protected: |
| - typedef ScopedVector<StatusIcon> StatusIcons; |
| + typedef std::vector<std::unique_ptr<StatusIcon>> StatusIcons; |
|
Lei Zhang
2017/03/23 02:59:26
using
leonhsl(Using Gerrit)
2017/03/23 15:03:17
Done.
|
| StatusTray(); |
| // Factory method for creating a status icon for this platform. |
| - virtual StatusIcon* CreatePlatformStatusIcon( |
| + virtual std::unique_ptr<StatusIcon> CreatePlatformStatusIcon( |
| StatusIconType type, |
| const gfx::ImageSkia& image, |
| const base::string16& tool_tip) = 0; |