| 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..a127a83ee91b5501069d86ae125df1e7bbaac6c3 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;
|
| + using StatusIcons = std::vector<std::unique_ptr<StatusIcon>>;
|
|
|
| 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;
|
|
|