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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/status_icons/status_tray.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/ui/views/status_icons/status_tray_win.h" 5 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
6 6
7 #include "base/win/wrapped_window_proc.h" 7 #include "base/win/wrapped_window_proc.h"
8 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" 8 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
9 #include "chrome/common/chrome_constants.h" 9 #include "chrome/common/chrome_constants.h"
10 #include "ui/base/win/hwnd_util.h" 10 #include "ui/base/win/hwnd_util.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 else 53 else
54 return ::DefWindowProc(hwnd, message, wparam, lparam); 54 return ::DefWindowProc(hwnd, message, wparam, lparam);
55 } 55 }
56 56
57 LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd, 57 LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd,
58 UINT message, 58 UINT message,
59 WPARAM wparam, 59 WPARAM wparam,
60 LPARAM lparam) { 60 LPARAM lparam) {
61 if (message == taskbar_created_message_) { 61 if (message == taskbar_created_message_) {
62 // We need to reset all of our icons because the taskbar went away. 62 // We need to reset all of our icons because the taskbar went away.
63 for (StatusIconList::const_iterator iter = status_icons().begin(); 63 for (StatusIcons::const_iterator i(status_icons().begin());
64 iter != status_icons().end(); 64 i != status_icons().end(); ++i) {
65 ++iter) { 65 StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i);
66 StatusIconWin* win_icon = static_cast<StatusIconWin*>(*iter);
67 win_icon->ResetIcon(); 66 win_icon->ResetIcon();
68 } 67 }
69 return TRUE; 68 return TRUE;
70 } else if (message == kStatusIconMessage) { 69 } else if (message == kStatusIconMessage) {
71 switch (lparam) { 70 switch (lparam) {
72 case WM_LBUTTONDOWN: 71 case WM_LBUTTONDOWN:
73 case WM_RBUTTONDOWN: 72 case WM_RBUTTONDOWN:
74 case WM_CONTEXTMENU: 73 case WM_CONTEXTMENU:
75 // Walk our icons, find which one was clicked on, and invoke its 74 // Walk our icons, find which one was clicked on, and invoke its
76 // HandleClickEvent() method. 75 // HandleClickEvent() method.
77 for (StatusIconList::const_iterator i(status_icons().begin()); 76 for (StatusIcons::const_iterator i(status_icons().begin());
78 i != status_icons().end(); ++i) { 77 i != status_icons().end(); ++i) {
79 StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i); 78 StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i);
80 if (win_icon->icon_id() == wparam) { 79 if (win_icon->icon_id() == wparam) {
81 gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint()); 80 gfx::Point cursor_pos(gfx::Screen::GetCursorScreenPoint());
82 win_icon->HandleClickEvent(cursor_pos, lparam == WM_LBUTTONDOWN); 81 win_icon->HandleClickEvent(cursor_pos, lparam == WM_LBUTTONDOWN);
83 break; 82 break;
84 } 83 }
85 } 84 }
86 return TRUE; 85 return TRUE;
87 } 86 }
88 } 87 }
89 return ::DefWindowProc(hwnd, message, wparam, lparam); 88 return ::DefWindowProc(hwnd, message, wparam, lparam);
90 } 89 }
91 90
92 StatusTrayWin::~StatusTrayWin() { 91 StatusTrayWin::~StatusTrayWin() {
93 if (window_) 92 if (window_)
94 DestroyWindow(window_); 93 DestroyWindow(window_);
95 94
96 if (atom_) 95 if (atom_)
97 UnregisterClass(MAKEINTATOM(atom_), instance_); 96 UnregisterClass(MAKEINTATOM(atom_), instance_);
98 } 97 }
99 98
100 StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() { 99 StatusIcon* StatusTrayWin::CreatePlatformStatusIcon() {
101 return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage); 100 return new StatusIconWin(next_icon_id_++, window_, kStatusIconMessage);
102 } 101 }
103 102
104 StatusTray* StatusTray::Create() { 103 StatusTray* StatusTray::Create() {
105 return new StatusTrayWin(); 104 return new StatusTrayWin();
106 } 105 }
OLDNEW
« 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