| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_icon_linux_wrapper.h" | 5 #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h" |
| 6 | 6 |
| 7 #include "ui/message_center/notifier_settings.h" |
| 7 #include "ui/views/linux_ui/linux_ui.h" | 8 #include "ui/views/linux_ui/linux_ui.h" |
| 8 | 9 |
| 9 StatusIconLinuxWrapper::StatusIconLinuxWrapper( | 10 StatusIconLinuxWrapper::StatusIconLinuxWrapper( |
| 10 views::StatusIconLinux* status_icon) | 11 views::StatusIconLinux* status_icon) |
| 11 : menu_model_(NULL) { | 12 : menu_model_(NULL) { |
| 12 status_icon_.reset(status_icon); | 13 status_icon_.reset(status_icon); |
| 13 status_icon_->set_delegate(this); | 14 status_icon_->set_delegate(this); |
| 14 } | 15 } |
| 15 | 16 |
| 16 StatusIconLinuxWrapper::~StatusIconLinuxWrapper() { | 17 StatusIconLinuxWrapper::~StatusIconLinuxWrapper() { |
| 17 if (menu_model_) | 18 if (menu_model_) |
| 18 menu_model_->RemoveObserver(this); | 19 menu_model_->RemoveObserver(this); |
| 19 } | 20 } |
| 20 | 21 |
| 21 void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) { | 22 void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) { |
| 22 status_icon_->SetImage(image); | 23 status_icon_->SetImage(image); |
| 23 } | 24 } |
| 24 | 25 |
| 25 void StatusIconLinuxWrapper::SetToolTip(const base::string16& tool_tip) { | 26 void StatusIconLinuxWrapper::SetToolTip(const base::string16& tool_tip) { |
| 26 status_icon_->SetToolTip(tool_tip); | 27 status_icon_->SetToolTip(tool_tip); |
| 27 } | 28 } |
| 28 | 29 |
| 29 void StatusIconLinuxWrapper::DisplayBalloon(const gfx::ImageSkia& icon, | 30 void StatusIconLinuxWrapper::DisplayBalloon( |
| 30 const base::string16& title, | 31 const gfx::ImageSkia& icon, |
| 31 const base::string16& contents) { | 32 const base::string16& title, |
| 32 notification_.DisplayBalloon(icon, title, contents); | 33 const base::string16& contents, |
| 34 const message_center::NotifierId& notifier_id) { |
| 35 notification_.DisplayBalloon(icon, title, contents, notifier_id); |
| 33 } | 36 } |
| 34 | 37 |
| 35 void StatusIconLinuxWrapper::OnClick() { | 38 void StatusIconLinuxWrapper::OnClick() { |
| 36 DispatchClickEvent(); | 39 DispatchClickEvent(); |
| 37 } | 40 } |
| 38 | 41 |
| 39 bool StatusIconLinuxWrapper::HasClickAction() { | 42 bool StatusIconLinuxWrapper::HasClickAction() { |
| 40 return HasObservers(); | 43 return HasObservers(); |
| 41 } | 44 } |
| 42 | 45 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 62 // If a menu already exists, remove ourself from its oberver list. | 65 // If a menu already exists, remove ourself from its oberver list. |
| 63 if (menu_model_) | 66 if (menu_model_) |
| 64 menu_model_->RemoveObserver(this); | 67 menu_model_->RemoveObserver(this); |
| 65 | 68 |
| 66 status_icon_->UpdatePlatformContextMenu(model); | 69 status_icon_->UpdatePlatformContextMenu(model); |
| 67 menu_model_ = model; | 70 menu_model_ = model; |
| 68 | 71 |
| 69 if (model) | 72 if (model) |
| 70 model->AddObserver(this); | 73 model->AddObserver(this); |
| 71 } | 74 } |
| OLD | NEW |