When extensions use notifications, display the name of the extension in UI ra...

chrome/browser/views/notifications/balloon_view.cc

 // Copyright (c) 2009 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/views/notifications/balloon_view.h"
 
 #include <vector>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/gdi_util.h"
@@ skipping 256 matching lines @@
                                           - kRightMargin,
                                   height() - kOptionsMenuHeight
                                            - kShelfBorderTopOverlap
                                            - kBottomMargin,
                                   kOptionsMenuWidth,
                                   kOptionsMenuHeight);
   AddChildView(options_menu_button_);
 
   const std::wstring source_label_text = l10n_util::GetStringF(
       IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,
-      ASCIIToWide(this->balloon_->notification().origin_url().spec()));
+      this->balloon_->notification().display_source());
 
   views::Label* source_label = new views::Label(source_label_text);
   source_label->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::SmallFont));
   source_label->SetColor(BrowserThemeProvider::kDefaultColorTabText);
   source_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   source_label->SetBounds(kLeftLabelMargin,
                           height() - kDismissButtonHeight
                                    - kShelfBorderTopOverlap
                                    - kBottomMargin,
@@ skipping 15 matching lines @@
   CreateOptionsMenu();
   options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 void BalloonViewImpl::CreateOptionsMenu() {
   if (options_menu_contents_.get())
     return;
 
   const std::wstring label_text = l10n_util::GetStringF(
       IDS_NOTIFICATION_BALLOON_REVOKE_MESSAGE,
-      ASCIIToWide(this->balloon_->notification().origin_url().spec()));
+      this->balloon_->notification().display_source());
 
   options_menu_contents_.reset(new views::SimpleMenuModel(this));
   options_menu_contents_->AddItem(kRevokePermissionCommand, label_text);
 
   options_menu_menu_.reset(new views::Menu2(options_menu_contents_.get()));
 }
 
 void BalloonViewImpl::GetContentsMask(const gfx::Rect& rect,
                                       gfx::Path* path) const {
   // This needs to remove areas that look like the following from each corner:
@@ skipping 103 matching lines @@
     NOTREACHED();
     return;
   }
 
   // If the renderer process attached to this balloon is disconnected
   // (e.g., because of a crash), we want to close the balloon.
   notification_registrar_.Remove(this,
       NotificationType::NOTIFY_BALLOON_DISCONNECTED, Source<Balloon>(balloon_));
   Close(false);
 }