Rebase the MessageBubble on the new views bubble.

chrome/browser/chromeos/status/network_menu_button.cc

 // Copyright (c) 2011 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/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 114 matching lines @@
 }
 
 NetworkMenuButton::~NetworkMenuButton() {
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
   netlib->RemoveNetworkManagerObserver(this);
   netlib->RemoveObserverForAllNetworks(this);
   netlib->RemoveCellularDataPlanObserver(this);
   if (!cellular_device_path_.empty())
     netlib->RemoveNetworkDeviceObserver(cellular_device_path_, this);
   if (mobile_data_bubble_)
-    mobile_data_bubble_->Close();
+    mobile_data_bubble_->GetWidget()->Close();
 }
 
 // static
 void NetworkMenuButton::RegisterPrefs(PrefService* local_state) {
   // Carrier deal notification shown count defaults to 0.
   local_state->RegisterIntegerPref(prefs::kCarrierDealPromoShown, 0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkLibrary::NetworkDeviceObserver implementation:
@@ skipping 88 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, NetworkMenuIcon::Delegate implementation:
 void NetworkMenuButton::NetworkMenuIconChanged() {
   const SkBitmap bitmap = network_icon_->GetIconAndText(NULL);
   SetIcon(bitmap);
   SchedulePaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// MessageBubbleDelegate implementation:
+// views::Widget::Observer implementation:
 
-void NetworkMenuButton::BubbleClosing(Bubble* bubble, bool closed_by_escape) {
+void NetworkMenuButton::OnWidgetClosing(views::Widget* widget) {
+  if (!mobile_data_bubble_ || mobile_data_bubble_->GetWidget() != widget)

[Nikita (slow), 2011/11/23 13:30:12]

I've checked this patch on Chrome OS.
OnWidgetClosing() is not called when bubble is closed so that leads to a crash
in ~NetworkMenuButton() as mobile_data_bubble_ is not NULL.

I've specifically executed chrome under GDB to check that OnWidgetClosing() is
not called.

[msw, 2011/11/29 00:11:07]

Fixed (added the observer on bubble construction). Thanks for the catch!

+    return;
+
   mobile_data_bubble_ = NULL;
   deal_info_url_.clear();
   deal_topup_url_.clear();
 }
 
-bool NetworkMenuButton::CloseOnEscape() {
-  return true;
-}
-
-bool NetworkMenuButton::FadeInOnShow() {
-  return false;
-}
+////////////////////////////////////////////////////////////////////////////////
+// MessageBubbleLinkListener implementation:
 
 void NetworkMenuButton::OnLinkActivated(size_t index) {
   // If we have deal info URL defined that means that there're
   // 2 links in bubble. Let the user close it manually then thus giving ability
   // to navigate to second link.
   // mobile_data_bubble_ will be set to NULL in BubbleClosing callback.
   if (deal_info_url_.empty() && mobile_data_bubble_)
-    mobile_data_bubble_->Close();
+    mobile_data_bubble_->GetWidget()->Close();
 
   std::string deal_url_to_open;
   if (index == 0) {
     if (!deal_topup_url_.empty()) {
       deal_url_to_open = deal_topup_url_;
     } else {
       const Network* cellular =
           CrosLibrary::Get()->GetNetworkLibrary()->cellular_network();
       if (!cellular)
         return;
@@ skipping 128 matching lines @@
             base::Bind(
                 &NetworkMenuButton::ShowOptionalMobileDataPromoNotification,
                 weak_ptr_factory_.GetWeakPtr(),
                 cros),
             kPromoShowDelayMs);
       }
       return;
     }
 
     // Add deal text if it's defined.
-    std::wstring notification_text;
-    std::wstring default_text =
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE));
+    string16 notification_text;
+    string16 default_text =
+        l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE);
     if (!deal_text.empty()) {
-      notification_text = StringPrintf(L"%ls\n\n%ls",
-                                       UTF8ToWide(deal_text).c_str(),
-                                       default_text.c_str());
+      notification_text =
+          UTF8ToUTF16(deal_text) + UTF8ToUTF16("\n\n") + default_text;
     } else {
       notification_text = default_text;
     }
 
     // Use deal URL if it's defined or general "Network Settings" URL.
     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<std::wstring> links;
-    links.push_back(UTF16ToWide(l10n_util::GetStringUTF16(link_message_id)));
+    std::vector<string16> links;
+    links.push_back(l10n_util::GetStringUTF16(link_message_id));
     if (!deal_info_url_.empty())
-      links.push_back(UTF16ToWide(l10n_util::GetStringUTF16(IDS_LEARN_MORE)));
-    mobile_data_bubble_ = MessageBubble::ShowWithLinks(
-        GetWidget(),
-        button_bounds,
-        views::BubbleBorder::TOP_RIGHT ,
+      links.push_back(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
+    mobile_data_bubble_ = new MessageBubble(
+        this,
+        views::BubbleBorder::TOP_RIGHT,
         ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_NOTIFICATION_3G),
         notification_text,
-        links,
-        this);
+        links);
+    mobile_data_bubble_->set_link_listener(this);
+    MessageBubble::ShowBubble(mobile_data_bubble_);
 
     check_for_promo_ = false;
     SetShow3gPromoNotification(false);
     if (carrier_deal_promo_pref != kNotificationCountPrefDefault)
       SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
   }
 }
 
 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
   SetTooltipText(label);
   SetAccessibleName(label);
 }
 
 }  // namespace chromeos