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 "ash/system/chromeos/network/tray_network.h" | 5 #include "ash/system/chromeos/network/tray_network.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/system/chromeos/network/network_icon_animation.h" | 9 #include "ash/system/chromeos/network/network_icon_animation.h" |
10 #include "ash/system/chromeos/network/network_list_detailed_view.h" | 10 #include "ash/system/chromeos/network/network_list_detailed_view.h" |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 } | 499 } |
500 | 500 |
501 void TrayNetwork::SetNetworkMessage(NetworkTrayDelegate* delegate, | 501 void TrayNetwork::SetNetworkMessage(NetworkTrayDelegate* delegate, |
502 MessageType message_type, | 502 MessageType message_type, |
503 NetworkType network_type, | 503 NetworkType network_type, |
504 const string16& title, | 504 const string16& title, |
505 const string16& message, | 505 const string16& message, |
506 const std::vector<string16>& links) { | 506 const std::vector<string16>& links) { |
507 messages_->messages()[message_type] = tray::NetworkMessages::Message( | 507 messages_->messages()[message_type] = tray::NetworkMessages::Message( |
508 delegate, network_type, title, message, links); | 508 delegate, network_type, title, message, links); |
| 509 if (!Shell::GetInstance()->system_tray_delegate()->IsOobeCompleted()) |
| 510 return; |
509 if (notification_) | 511 if (notification_) |
510 notification_->Update(); | 512 notification_->Update(); |
511 else | 513 else |
512 ShowNotificationView(); | 514 ShowNotificationView(); |
513 } | 515 } |
514 | 516 |
515 void TrayNetwork::ClearNetworkMessage(MessageType message_type) { | 517 void TrayNetwork::ClearNetworkMessage(MessageType message_type) { |
516 messages_->messages().erase(message_type); | 518 messages_->messages().erase(message_type); |
517 if (messages_->messages().empty()) { | 519 if (messages_->messages().empty()) { |
518 HideNotificationView(); | 520 HideNotificationView(); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
618 | 620 |
619 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) { | 621 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) { |
620 tray::NetworkMessages::MessageMap::const_iterator iter = | 622 tray::NetworkMessages::MessageMap::const_iterator iter = |
621 messages()->messages().find(message_type); | 623 messages()->messages().find(message_type); |
622 if (iter != messages()->messages().end() && iter->second.delegate) | 624 if (iter != messages()->messages().end() && iter->second.delegate) |
623 iter->second.delegate->NotificationLinkClicked(message_type, link_id); | 625 iter->second.delegate->NotificationLinkClicked(message_type, link_id); |
624 } | 626 } |
625 | 627 |
626 } // namespace internal | 628 } // namespace internal |
627 } // namespace ash | 629 } // namespace ash |
OLD | NEW |