| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/message_center/message_center_tray.h" | 5 #include "ui/message_center/message_center_tray.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/observer_list.h" | 9 #include "base/observer_list.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 popups_visible_(false), | 112 popups_visible_(false), |
| 113 delegate_(delegate) { | 113 delegate_(delegate) { |
| 114 message_center_->AddObserver(this); | 114 message_center_->AddObserver(this); |
| 115 } | 115 } |
| 116 | 116 |
| 117 MessageCenterTray::~MessageCenterTray() { | 117 MessageCenterTray::~MessageCenterTray() { |
| 118 message_center_->RemoveObserver(this); | 118 message_center_->RemoveObserver(this); |
| 119 } | 119 } |
| 120 | 120 |
| 121 bool MessageCenterTray::ShowMessageCenterBubble() { | 121 bool MessageCenterTray::ShowMessageCenterBubble() { |
| 122 LOG(ERROR) << "YES"; |
| 122 if (message_center_visible_) | 123 if (message_center_visible_) |
| 123 return true; | 124 return true; |
| 124 | 125 |
| 125 HidePopupBubbleInternal(); | 126 HidePopupBubbleInternal(); |
| 126 | 127 |
| 127 message_center_visible_ = delegate_->ShowMessageCenter(); | 128 message_center_visible_ = delegate_->ShowMessageCenter(); |
| 128 if (message_center_visible_) { | 129 if (message_center_visible_) { |
| 129 message_center_->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER); | 130 message_center_->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER); |
| 130 NotifyMessageCenterTrayChanged(); | 131 NotifyMessageCenterTrayChanged(); |
| 131 } | 132 } |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 ShowPopupBubble(); | 268 ShowPopupBubble(); |
| 268 | 269 |
| 269 NotifyMessageCenterTrayChanged(); | 270 NotifyMessageCenterTrayChanged(); |
| 270 } | 271 } |
| 271 | 272 |
| 272 void MessageCenterTray::NotifyMessageCenterTrayChanged() { | 273 void MessageCenterTray::NotifyMessageCenterTrayChanged() { |
| 273 delegate_->OnMessageCenterTrayChanged(); | 274 delegate_->OnMessageCenterTrayChanged(); |
| 274 } | 275 } |
| 275 | 276 |
| 276 } // namespace message_center | 277 } // namespace message_center |
| OLD | NEW |