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

Unified Diff: chrome/browser/status_icons/status_tray.cc

Issue 10382229: status_icons: Change StatusTray to use ScopedVector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittest Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/status_icons/status_tray.h ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/status_icons/status_tray.cc
diff --git a/chrome/browser/status_icons/status_tray.cc b/chrome/browser/status_icons/status_tray.cc
index dccc94f5205c583ef56f5812909d035a2b367bea..3d99ad515af8224c9da3d0a5da4cec803127b608 100644
--- a/chrome/browser/status_icons/status_tray.cc
+++ b/chrome/browser/status_icons/status_tray.cc
@@ -6,14 +6,9 @@
#include <algorithm>
-#include "base/stl_util.h"
#include "chrome/browser/status_icons/status_icon.h"
-StatusTray::StatusTray() {
-}
-
StatusTray::~StatusTray() {
- STLDeleteElements(&status_icons_);
}
StatusIcon* StatusTray::CreateStatusIcon() {
@@ -24,13 +19,16 @@ StatusIcon* StatusTray::CreateStatusIcon() {
}
void StatusTray::RemoveStatusIcon(StatusIcon* icon) {
- StatusIconList::iterator i(std::find(status_icons_.begin(),
- status_icons_.end(), icon));
+ StatusIcons::iterator i(
+ std::find(status_icons_.begin(), status_icons_.end(), icon));
+
if (i == status_icons_.end()) {
NOTREACHED();
return;
}
- delete *i;
status_icons_.erase(i);
}
+
+StatusTray::StatusTray() {
+}
« no previous file with comments | « chrome/browser/status_icons/status_tray.h ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698