Data promo notification should follow the normal ash notifications theme. This

chrome/browser/chromeos/status/data_promo_notification.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
+#include "ash/system/network/network_observer.h"
+#include "ash/system/tray/system_tray.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
-#include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 85 matching lines @@
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // DataPromoNotification
 
 DataPromoNotification::DataPromoNotification()
-    : mobile_data_bubble_(NULL),
-      check_for_promo_(true),
+    : check_for_promo_(true),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 DataPromoNotification::~DataPromoNotification() {
-  if (mobile_data_bubble_)
-    mobile_data_bubble_->GetWidget()->Close();
+  CloseNotification();
 }
 
 void DataPromoNotification::RegisterPrefs(PrefService* local_state) {
   // Carrier deal notification shown count defaults to 0.
   local_state->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);
 }
 
 void DataPromoNotification::ShowOptionalMobileDataPromoNotification(
     NetworkLibrary* cros,
     views::View* host,
-    MessageBubbleLinkListener* listener) {
+    ash::NetworkTrayDelegate* listener) {
   // Display one-time notification for non-Guest users on first use
   // of Mobile Data connection or if there's a carrier deal defined
   // show that even if user has already seen generic promo.
   if (UserManager::Get()->IsUserLoggedIn() &&
       !UserManager::Get()->IsLoggedInAsGuest() &&
       check_for_promo_ &&
       cros->cellular_connected() && !cros->ethernet_connected() &&
       !cros->wifi_connected() && !cros->wimax_connected()) {
     std::string deal_text;
     int carrier_deal_promo_pref = kNotificationCountPrefDefault;
     const MobileConfig::CarrierDeal* deal = NULL;
     const MobileConfig::Carrier* carrier = GetCarrier(cros);
     if (carrier)
       deal = GetCarrierDeal(carrier);
+    deal_info_url_.clear();
+    deal_topup_url_.clear();
     if (deal) {
       carrier_deal_promo_pref = GetCarrierDealPromoShown();
       const std::string locale = g_browser_process->GetApplicationLocale();
       deal_text = deal->GetLocalizedString(locale, "notification_text");
       deal_info_url_ = deal->info_url();
       deal_topup_url_ = carrier->top_up_url();
     } else if (!ShouldShow3gPromoNotification()) {
       check_for_promo_ = false;
       return;
     }
@@ skipping 31 matching lines @@
     int link_message_id;
     if (deal_topup_url_.empty())
       link_message_id = IDS_OFFLINE_NETWORK_SETTINGS;
     else
       link_message_id = IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT;
 
     std::vector<string16> links;
     links.push_back(l10n_util::GetStringUTF16(link_message_id));
     if (!deal_info_url_.empty())
       links.push_back(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
-    mobile_data_bubble_ = new MessageBubble(
-        host,
-        views::BubbleBorder::TOP_RIGHT,
-        ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-            IDR_NOTIFICATION_3G),
-        message,
-        links);
-    mobile_data_bubble_->set_link_listener(listener);
-    mobile_data_bubble_->set_parent_window(
-        ash::Shell::GetContainer(
-            ash::Shell::GetPrimaryRootWindow(),
-            ash::internal::kShellWindowId_SettingBubbleContainer));
-    views::BubbleDelegateView::CreateBubble(mobile_data_bubble_);
-    mobile_data_bubble_->Show();
-    mobile_data_bubble_->GetWidget()->AddObserver(this);
+    if (ash::Shell::GetInstance()->system_tray()->network_observer()) {
+      ash::Shell::GetInstance()->system_tray()->network_observer()->
+          SetNetworkMessage(listener, ash::NetworkObserver::MESSAGE_DATA_PROMO,
+              string16(), message, links);
+    }
 
     check_for_promo_ = false;
     SetShow3gPromoNotification(false);
     if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void DataPromoNotification::CloseNotification() {
-  if (mobile_data_bubble_)
-    mobile_data_bubble_->GetWidget()->Close();
-}
-
-void DataPromoNotification::OnWidgetClosing(views::Widget* widget) {
-  if (!mobile_data_bubble_ || mobile_data_bubble_->GetWidget() != widget)
-    return;
-
-  mobile_data_bubble_ = NULL;
-  deal_info_url_.clear();
-  deal_topup_url_.clear();
+  if (ash::Shell::GetInstance()->system_tray()->network_observer()) {
+    ash::Shell::GetInstance()->system_tray()->network_observer()->
+        ClearNetworkMessage(ash::NetworkObserver::MESSAGE_DATA_PROMO);
+  }
 }
 
 }  // namespace chromeos