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 "base/memory/ptr_util.h" |
7 #include "ui/message_center/notifier_settings.h" | 8 #include "ui/message_center/notifier_settings.h" |
8 #include "ui/views/linux_ui/linux_ui.h" | 9 #include "ui/views/linux_ui/linux_ui.h" |
9 | 10 |
10 StatusIconLinuxWrapper::StatusIconLinuxWrapper( | 11 StatusIconLinuxWrapper::StatusIconLinuxWrapper( |
11 views::StatusIconLinux* status_icon) | 12 std::unique_ptr<views::StatusIconLinux> status_icon) |
12 : menu_model_(NULL) { | 13 : status_icon_(std::move(status_icon)), menu_model_(nullptr) { |
13 status_icon_.reset(status_icon); | |
14 status_icon_->set_delegate(this); | 14 status_icon_->set_delegate(this); |
15 } | 15 } |
16 | 16 |
17 StatusIconLinuxWrapper::~StatusIconLinuxWrapper() { | 17 StatusIconLinuxWrapper::~StatusIconLinuxWrapper() { |
18 if (menu_model_) | 18 if (menu_model_) |
19 menu_model_->RemoveObserver(this); | 19 menu_model_->RemoveObserver(this); |
20 } | 20 } |
21 | 21 |
22 void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) { | 22 void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) { |
23 status_icon_->SetImage(image); | 23 status_icon_->SetImage(image); |
(...skipping 16 matching lines...) Expand all Loading... |
40 } | 40 } |
41 | 41 |
42 bool StatusIconLinuxWrapper::HasClickAction() { | 42 bool StatusIconLinuxWrapper::HasClickAction() { |
43 return HasObservers(); | 43 return HasObservers(); |
44 } | 44 } |
45 | 45 |
46 void StatusIconLinuxWrapper::OnMenuStateChanged() { | 46 void StatusIconLinuxWrapper::OnMenuStateChanged() { |
47 status_icon_->RefreshPlatformContextMenu(); | 47 status_icon_->RefreshPlatformContextMenu(); |
48 } | 48 } |
49 | 49 |
50 StatusIconLinuxWrapper* StatusIconLinuxWrapper::CreateWrappedStatusIcon( | 50 std::unique_ptr<StatusIconLinuxWrapper> |
| 51 StatusIconLinuxWrapper::CreateWrappedStatusIcon( |
51 const gfx::ImageSkia& image, | 52 const gfx::ImageSkia& image, |
52 const base::string16& tool_tip) { | 53 const base::string16& tool_tip) { |
53 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); | 54 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); |
54 if (linux_ui) { | 55 if (linux_ui) { |
55 std::unique_ptr<views::StatusIconLinux> status_icon = | 56 auto status_icon = linux_ui->CreateLinuxStatusIcon(image, tool_tip); |
56 linux_ui->CreateLinuxStatusIcon(image, tool_tip); | 57 if (status_icon) { |
57 if (status_icon.get()) | 58 return base::WrapUnique( |
58 return new StatusIconLinuxWrapper(status_icon.release()); | 59 new StatusIconLinuxWrapper(std::move(status_icon))); |
| 60 } |
59 } | 61 } |
60 return NULL; | 62 return nullptr; |
61 } | 63 } |
62 | 64 |
63 void StatusIconLinuxWrapper::UpdatePlatformContextMenu( | 65 void StatusIconLinuxWrapper::UpdatePlatformContextMenu( |
64 StatusIconMenuModel* model) { | 66 StatusIconMenuModel* model) { |
65 // If a menu already exists, remove ourself from its oberver list. | 67 // If a menu already exists, remove ourself from its oberver list. |
66 if (menu_model_) | 68 if (menu_model_) |
67 menu_model_->RemoveObserver(this); | 69 menu_model_->RemoveObserver(this); |
68 | 70 |
69 status_icon_->UpdatePlatformContextMenu(model); | 71 status_icon_->UpdatePlatformContextMenu(model); |
70 menu_model_ = model; | 72 menu_model_ = model; |
71 | 73 |
72 if (model) | 74 if (model) |
73 model->AddObserver(this); | 75 model->AddObserver(this); |
74 } | 76 } |
OLD | NEW |