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

Unified Diff: chrome/browser/ui/views/status_icons/status_tray_win.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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/status_icons/status_tray_win.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc
index 46a32561f7625ac1a424e8affeaa77a86b48cc82..5813fa70801212fe6eac58d487678570e59916ca 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -60,10 +60,9 @@ LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd,
LPARAM lparam) {
if (message == taskbar_created_message_) {
// We need to reset all of our icons because the taskbar went away.
- for (StatusIconList::const_iterator iter = status_icons().begin();
- iter != status_icons().end();
- ++iter) {
- StatusIconWin* win_icon = static_cast<StatusIconWin*>(*iter);
+ for (StatusIcons::const_iterator i(status_icons().begin());
+ i != status_icons().end(); ++i) {
+ StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i);
win_icon->ResetIcon();
}
return TRUE;
@@ -74,7 +73,7 @@ LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd,
case WM_CONTEXTMENU:
// Walk our icons, find which one was clicked on, and invoke its
// HandleClickEvent() method.
- for (StatusIconList::const_iterator i(status_icons().begin());
+ for (StatusIcons::const_iterator i(status_icons().begin());
i != status_icons().end(); ++i) {
StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i);
if (win_icon->icon_id() == wparam) {
« no previous file with comments | « chrome/browser/status_icons/status_tray.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698