OLD | NEW |
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/chromeos/status/volume_menu_button.h" | 5 #include "chrome/browser/chromeos/status/volume_menu_button.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 } | 223 } |
224 | 224 |
225 void VolumeMenuButton::OnLocaleChanged() { | 225 void VolumeMenuButton::OnLocaleChanged() { |
226 UpdateIcon(); | 226 UpdateIcon(); |
227 } | 227 } |
228 | 228 |
229 void VolumeMenuButton::OnVolumeChanged() { | 229 void VolumeMenuButton::OnVolumeChanged() { |
230 UpdateIcon(); | 230 UpdateIcon(); |
231 } | 231 } |
232 | 232 |
233 void VolumeMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { | 233 void VolumeMenuButton::OnMenuButtonClicked(views::View* source, |
| 234 const gfx::Point& point) { |
234 // TODO(achuith): Minimum width of MenuItemView is 27 pix which is too wide | 235 // TODO(achuith): Minimum width of MenuItemView is 27 pix which is too wide |
235 // for our purposes here. | 236 // for our purposes here. |
236 views::MenuItemView* menu = new views::MenuItemView(this); | 237 views::MenuItemView* menu = new views::MenuItemView(this); |
237 // MenuRunner takes ownership of |menu|. | 238 // MenuRunner takes ownership of |menu|. |
238 views::MenuRunner* menu_runner = new views::MenuRunner(menu); | 239 views::MenuRunner* menu_runner = new views::MenuRunner(menu); |
239 views::MenuItemView* submenu = menu->AppendMenuItem( | 240 views::MenuItemView* submenu = menu->AppendMenuItem( |
240 kMenuItemId, | 241 kMenuItemId, |
241 string16(), | 242 string16(), |
242 views::MenuItemView::NORMAL); | 243 views::MenuItemView::NORMAL); |
243 submenu->AddChildView(new StatusAreaBubbleContentView( | 244 submenu->AddChildView(new StatusAreaBubbleContentView( |
(...skipping 12 matching lines...) Expand all Loading... |
256 this, | 257 this, |
257 bounds, | 258 bounds, |
258 views::MenuItemView::TOPRIGHT, | 259 views::MenuItemView::TOPRIGHT, |
259 views::MenuRunner::HAS_MNEMONICS); | 260 views::MenuRunner::HAS_MNEMONICS); |
260 | 261 |
261 if (result != views::MenuRunner::MENU_DELETED) | 262 if (result != views::MenuRunner::MENU_DELETED) |
262 delete menu_runner; | 263 delete menu_runner; |
263 } | 264 } |
264 | 265 |
265 } // namespace chromeos | 266 } // namespace chromeos |
OLD | NEW |