Remove renamed balloon_view.cc and balloon_collection_impl_aura.cc

These should have been removed in http://codereview.chromium.org/10546006/ but got lost in the revert/resubmit.

(They were originally removed in http://codereview.chromium.org/10502026/)

TBR=ben
BUG=124914
TEST=Chrome compiles on all platforms.

Review URL: https://chromiumcodereview.appspot.com/10546030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140913 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 863 deletions

diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.cc
deleted file mode 100644
index b933483..0000000
--- a/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-// 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/notifications/balloon_collection_impl_aura.h"
-
-#include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/notifications/notification.h"
-#include "chrome/browser/ui/views/notifications/balloon_view.h"
-#include "chrome/browser/ui/views/notifications/balloon_view_host.h"
-
-namespace chromeos {
-
-BalloonCollectionImplAura::BalloonCollectionImplAura() {
-}
-
-BalloonCollectionImplAura::~BalloonCollectionImplAura() {
-}
-
-bool BalloonCollectionImplAura::AddWebUIMessageCallback(
-    const Notification& notification,
-    const std::string& message,
-    const BalloonViewHost::MessageCallback& callback) {
-  Balloon* balloon = base().FindBalloon(notification);
-  if (!balloon)
-    return false;
-
-  BalloonViewHost* host =
-      static_cast<chromeos::BalloonViewHost*>(balloon->view()->GetHost());
-  return host->AddWebUIMessageCallback(message, callback);
-}
-
-void BalloonCollectionImplAura::AddSystemNotification(
-    const Notification& notification,
-    Profile* profile,
-    bool sticky) {
-  system_notifications_.insert(notification.notification_id());
-
-  // Add balloons to the front of the stack. This ensures that system
-  // notifications will always be displayed. NOTE: This has the side effect
-  // that system notifications are displayed in inverse order, with the most
-  // recent notification always at the front of the list.
-  AddImpl(notification, profile, true /* add to front*/);
-}
-
-bool BalloonCollectionImplAura::UpdateNotification(
-    const Notification& notification) {
-  Balloon* balloon = base().FindBalloon(notification);
-  if (!balloon)
-    return false;
-  balloon->Update(notification);
-  return true;
-}
-
-bool BalloonCollectionImplAura::UpdateAndShowNotification(
-    const Notification& notification) {
-  return UpdateNotification(notification);
-}
-
-Balloon* BalloonCollectionImplAura::MakeBalloon(
-    const Notification& notification, Profile* profile) {
-  Balloon* balloon = new Balloon(notification, profile, this);
-  ::BalloonViewImpl* balloon_view = new ::BalloonViewImpl(this);
-  if (system_notifications_.find(notification.notification_id()) !=
-      system_notifications_.end())
-    balloon_view->set_enable_web_ui(true);
-  balloon->set_view(balloon_view);
-  gfx::Size size(layout().min_balloon_width(), layout().min_balloon_height());
-  balloon->set_content_size(size);
-  return balloon;
-}
-
-}  // namespace chromeos
-
-// static
-BalloonCollection* BalloonCollection::Create() {
-  return new chromeos::BalloonCollectionImplAura();
-}
diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.h b/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.h
deleted file mode 100644
index 18631dc..0000000
--- a/chrome/browser/chromeos/notifications/balloon_collection_impl_aura.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_COLLECTION_IMPL_AURA_H_
-#define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_COLLECTION_IMPL_AURA_H_
-#pragma once
-
-#include <set>
-
-#include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"  // MessageCallback
-#include "chrome/browser/notifications/balloon_collection_impl.h"
-
-namespace chromeos {
-
-// Wrapper on top of ::BalloonCollectionImpl to provide an interface for
-// chromeos::SystemNotification.
-class BalloonCollectionImplAura : public ::BalloonCollectionImpl {
- public:
-  BalloonCollectionImplAura();
-  virtual ~BalloonCollectionImplAura();
-
-  // Adds a callback for WebUI message. Returns true if the callback
-  // is succssfully registered, or false otherwise. It fails to add if
-  // there is no notification that matches NotificationDelegate::id(),
-  // or a callback for given message already exists. The callback
-  // object is owned and deleted by callee.
-  bool AddWebUIMessageCallback(
-      const Notification& notification,
-      const std::string& message,
-      const BalloonViewHost::MessageCallback& callback);
-
-  // Adds a new system notification.
-  // |sticky| is ignored in the Aura implementation; desktop notifications
-  // are always sticky (i.e. they need to be dismissed explicitly).
-  void AddSystemNotification(const Notification& notification,
-                             Profile* profile,
-                             bool sticky);
-
-  // Updates the notification's content. It uses
-  // NotificationDelegate::id() to check the equality of notifications.
-  // Returns true if the notification has been updated. False if
-  // no corresponding notification is found. This will not change the
-  // visibility of the notification.
-  bool UpdateNotification(const Notification& notification);
-
-  // On Aura this behaves the same as UpdateNotification.
-  bool UpdateAndShowNotification(const Notification& notification);
-
- protected:
-  // Creates a new balloon. Overridable by unit tests.  The caller is
-  // responsible for freeing the pointer returned.
-  virtual Balloon* MakeBalloon(const Notification& notification,
-                               Profile* profile) OVERRIDE;
-
- private:
-  // Set of unique ids associated with system notifications, used by
-  // MakeBalloon to determine whether or not to enable Web UI.
-  std::set<std::string> system_notifications_;
-
-  DISALLOW_COPY_AND_ASSIGN(BalloonCollectionImplAura);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_BALLOON_COLLECTION_IMPL_AURA_H_
diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc
deleted file mode 100644
index dc97e9b..0000000
--- a/chrome/browser/ui/views/notifications/balloon_view.cc
+++ /dev/null
@@ -1,550 +0,0 @@
-// 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/ui/views/notifications/balloon_view.h"
-
-#include <algorithm>
-#include <vector>
-
-#include "base/bind.h"
-#include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/notifications/balloon_collection.h"
-#include "chrome/browser/notifications/desktop_notification_service.h"
-#include "chrome/browser/notifications/notification.h"
-#include "chrome/browser/notifications/notification_options_menu_model.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host_view.h"
-#include "content/public/browser/web_contents.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "grit/theme_resources_standard.h"
-#include "ui/base/animation/slide_animation.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/insets.h"
-#include "ui/gfx/native_widget_types.h"
-#include "ui/views/bubble/bubble_border.h"
-#include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/text_button.h"
-#include "ui/views/controls/menu/menu_item_view.h"
-#include "ui/views/controls/menu/menu_model_adapter.h"
-#include "ui/views/controls/menu/menu_runner.h"
-#include "ui/views/controls/native/native_view_host.h"
-#include "ui/views/painter.h"
-#include "ui/views/widget/widget.h"
-
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/notifications/balloon_view_host_chromeos.h"
-#else
-#include "chrome/browser/ui/views/notifications/balloon_view_host.h"
-#endif
-
-using views::Widget;
-
-namespace {
-
-const int kTopMargin = 2;
-const int kBottomMargin = 0;
-const int kLeftMargin = 4;
-const int kRightMargin = 4;
-const int kShelfBorderTopOverlap = 0;
-
-// Properties of the dismiss button.
-const int kDismissButtonWidth = 14;
-const int kDismissButtonHeight = 14;
-const int kDismissButtonTopMargin = 6;
-const int kDismissButtonRightMargin = 6;
-
-// Properties of the options menu.
-const int kOptionsButtonWidth = 21;
-const int kOptionsButtonHeight = 14;
-const int kOptionsButtonTopMargin = 5;
-const int kOptionsButtonRightMargin = 4;
-
-// Properties of the origin label.
-const int kLabelLeftMargin = 10;
-const int kLabelTopMargin = 6;
-
-// Size of the drop shadow.  The shadow is provided by BubbleBorder,
-// not this class.
-const int kLeftShadowWidth = 0;
-const int kRightShadowWidth = 0;
-const int kTopShadowWidth = 0;
-const int kBottomShadowWidth = 6;
-
-// Optional animation.
-const bool kAnimateEnabled = true;
-
-// The shelf height for the system default font size.  It is scaled
-// with changes in the default font size.
-const int kDefaultShelfHeight = 22;
-
-// Menu commands
-const int kRevokePermissionCommand = 0;
-
-// Colors
-const SkColor kControlBarBackgroundColor = SkColorSetRGB(245, 245, 245);
-const SkColor kControlBarTextColor = SkColorSetRGB(125, 125, 125);
-const SkColor kControlBarSeparatorLineColor = SkColorSetRGB(180, 180, 180);
-
-}  // namespace
-
-BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection)
-    : balloon_(NULL),
-      collection_(collection),
-      frame_container_(NULL),
-      html_container_(NULL),
-      html_contents_(NULL),
-      method_factory_(this),
-      close_button_(NULL),
-      animation_(NULL),
-      options_menu_model_(NULL),
-      options_menu_button_(NULL),
-      enable_web_ui_(false) {
-  // This object is not to be deleted by the views hierarchy,
-  // as it is owned by the balloon.
-  set_owned_by_client();
-
-  views::BubbleBorder* bubble_border =
-      new views::BubbleBorder(views::BubbleBorder::FLOAT,
-                              views::BubbleBorder::NO_SHADOW);
-  set_border(bubble_border);
-}
-
-BalloonViewImpl::~BalloonViewImpl() {
-}
-
-void BalloonViewImpl::Close(bool by_user) {
-  animation_->Stop();
-  html_contents_->Shutdown();
-  // Detach contents from widget before then close.
-  // This is necessary because a widget may be deleted
-  // after this when chrome is shutting down.
-  html_container_->GetRootView()->RemoveAllChildViews(true);
-  html_container_->Close();
-  frame_container_->GetRootView()->RemoveAllChildViews(true);
-  frame_container_->Close();
-  // Post the tast at the end to sure this this WidgetDelegate
-  // instance is avaiable when Widget::CloseNow gets called.
-  MessageLoop::current()->PostTask(FROM_HERE,
-                                   base::Bind(&BalloonViewImpl::DelayedClose,
-                                              method_factory_.GetWeakPtr(),
-                                              by_user));
-}
-
-gfx::Size BalloonViewImpl::GetSize() const {
-  // BalloonView has no size if it hasn't been shown yet (which is when
-  // balloon_ is set).
-  if (!balloon_)
-    return gfx::Size(0, 0);
-
-  return gfx::Size(GetTotalWidth(), GetTotalHeight());
-}
-
-BalloonHost* BalloonViewImpl::GetHost() const {
-  return html_contents_.get();
-}
-
-void BalloonViewImpl::OnMenuButtonClicked(views::View* source,
-                                          const gfx::Point& point) {
-  CreateOptionsMenu();
-
-  views::MenuModelAdapter menu_model_adapter(options_menu_model_.get());
-  menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
-
-  gfx::Point screen_location;
-  views::View::ConvertPointToScreen(options_menu_button_, &screen_location);
-  if (menu_runner_->RunMenuAt(
-          source->GetWidget()->GetTopLevelWidget(),
-          options_menu_button_,
-          gfx::Rect(screen_location, options_menu_button_->size()),
-          views::MenuItemView::TOPRIGHT,
-          views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
-    return;
-}
-
-void BalloonViewImpl::OnDisplayChanged() {
-  collection_->DisplayChanged();
-}
-
-void BalloonViewImpl::OnWorkAreaChanged() {
-  collection_->DisplayChanged();
-}
-
-void BalloonViewImpl::ButtonPressed(views::Button* sender,
-                                    const views::Event&) {
-  // The only button currently is the close button.
-  DCHECK(sender == close_button_);
-  Close(true);
-}
-
-void BalloonViewImpl::DelayedClose(bool by_user) {
-  balloon_->OnClose(by_user);
-}
-
-gfx::Size BalloonViewImpl::GetPreferredSize() {
-  return gfx::Size(1000, 1000);
-}
-
-void BalloonViewImpl::SizeContentsWindow() {
-  if (!html_container_ || !frame_container_)
-    return;
-
-  gfx::Rect contents_rect = GetContentsRectangle();
-  html_container_->SetBounds(contents_rect);
-  html_container_->StackAboveWidget(frame_container_);
-
-  gfx::Path path;
-  GetContentsMask(contents_rect, &path);
-  html_container_->SetShape(path.CreateNativeRegion());
-
-  close_button_->SetBoundsRect(GetCloseButtonBounds());
-  options_menu_button_->SetBoundsRect(GetOptionsButtonBounds());
-  source_label_->SetBoundsRect(GetLabelBounds());
-}
-
-void BalloonViewImpl::RepositionToBalloon() {
-  DCHECK(frame_container_);
-  DCHECK(html_container_);
-  DCHECK(balloon_);
-
-  if (!kAnimateEnabled) {
-    frame_container_->SetBounds(
-        gfx::Rect(balloon_->GetPosition().x(), balloon_->GetPosition().y(),
-                  GetTotalWidth(), GetTotalHeight()));
-    gfx::Rect contents_rect = GetContentsRectangle();
-    html_container_->SetBounds(contents_rect);
-    html_contents_->SetPreferredSize(contents_rect.size());
-    content::RenderWidgetHostView* view =
-        html_contents_->web_contents()->GetRenderWidgetHostView();
-    if (view)
-      view->SetSize(contents_rect.size());
-    return;
-  }
-
-  anim_frame_end_ = gfx::Rect(
-      balloon_->GetPosition().x(), balloon_->GetPosition().y(),
-      GetTotalWidth(), GetTotalHeight());
-  anim_frame_start_ = frame_container_->GetClientAreaScreenBounds();
-  animation_.reset(new ui::SlideAnimation(this));
-  animation_->Show();
-}
-
-void BalloonViewImpl::Update() {
-  DCHECK(html_contents_.get()) << "BalloonView::Update called before Show";
-  if (!html_contents_->web_contents())
-    return;
-  html_contents_->web_contents()->GetController().LoadURL(
-      balloon_->notification().content_url(), content::Referrer(),
-      content::PAGE_TRANSITION_LINK, std::string());
-}
-
-void BalloonViewImpl::AnimationProgressed(const ui::Animation* animation) {
-  DCHECK(animation == animation_.get());
-
-  // Linear interpolation from start to end position.
-  double e = animation->GetCurrentValue();
-  double s = (1.0 - e);
-
-  gfx::Rect frame_position(
-    static_cast<int>(s * anim_frame_start_.x() +
-                     e * anim_frame_end_.x()),
-    static_cast<int>(s * anim_frame_start_.y() +
-                     e * anim_frame_end_.y()),
-    static_cast<int>(s * anim_frame_start_.width() +
-                     e * anim_frame_end_.width()),
-    static_cast<int>(s * anim_frame_start_.height() +
-                     e * anim_frame_end_.height()));
-  frame_container_->SetBounds(frame_position);
-
-  gfx::Path path;
-  gfx::Rect contents_rect = GetContentsRectangle();
-  html_container_->SetBounds(contents_rect);
-  GetContentsMask(contents_rect, &path);
-  html_container_->SetShape(path.CreateNativeRegion());
-
-  html_contents_->SetPreferredSize(contents_rect.size());
-  content::RenderWidgetHostView* view =
-      html_contents_->web_contents()->GetRenderWidgetHostView();
-  if (view)
-    view->SetSize(contents_rect.size());
-}
-
-gfx::Rect BalloonViewImpl::GetCloseButtonBounds() const {
-  return gfx::Rect(
-      width() - kDismissButtonWidth -
-          kDismissButtonRightMargin - kRightShadowWidth,
-      kDismissButtonTopMargin,
-      kDismissButtonWidth,
-      kDismissButtonHeight);
-}
-
-gfx::Rect BalloonViewImpl::GetOptionsButtonBounds() const {
-  gfx::Rect close_rect = GetCloseButtonBounds();
-
-  return gfx::Rect(
-      close_rect.x() - kOptionsButtonWidth - kOptionsButtonRightMargin,
-      kOptionsButtonTopMargin,
-      kOptionsButtonWidth,
-      kOptionsButtonHeight);
-}
-
-gfx::Rect BalloonViewImpl::GetLabelBounds() const {
-  return gfx::Rect(
-      kLeftShadowWidth + kLabelLeftMargin,
-      kLabelTopMargin,
-      std::max(0, width() - kOptionsButtonWidth -
-               kRightMargin),
-      kOptionsButtonHeight);
-}
-
-void BalloonViewImpl::Show(Balloon* balloon) {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-
-  balloon_ = balloon;
-
-  SetBounds(balloon_->GetPosition().x(), balloon_->GetPosition().y(),
-            GetTotalWidth(), GetTotalHeight());
-
-  const string16 source_label_text = l10n_util::GetStringFUTF16(
-      IDS_NOTIFICATION_BALLOON_SOURCE_LABEL,
-      balloon->notification().display_source());
-
-  source_label_ = new views::Label(source_label_text);
-  AddChildView(source_label_);
-  options_menu_button_ = new views::MenuButton(NULL, string16(), this, false);
-  AddChildView(options_menu_button_);
-#if defined(OS_CHROMEOS)
-  // Disable and hide the options menu on ChromeOS. This is a short term fix
-  // for a crash (long term we're redesigning notifications).
-  options_menu_button_->SetEnabled(false);
-  options_menu_button_->SetVisible(false);
-#endif
-  close_button_ = new views::ImageButton(this);
-  close_button_->SetTooltipText(l10n_util::GetStringUTF16(
-      IDS_NOTIFICATION_BALLOON_DISMISS_LABEL));
-  AddChildView(close_button_);
-
-  // We have to create two windows: one for the contents and one for the
-  // frame.  Why?
-  // * The contents is an html window which cannot be a
-  //   layered window (because it may have child windows for instance).
-  // * The frame is a layered window so that we can have nicely rounded
-  //   corners using alpha blending (and we may do other alpha blending
-  //   effects).
-  // Unfortunately, layered windows cannot have child windows. (Well, they can
-  // but the child windows don't render).
-  //
-  // We carefully keep these two windows in sync to present the illusion of
-  // one window to the user.
-  //
-  // We don't let the OS manage the RTL layout of these widgets, because
-  // this code is already taking care of correctly reversing the layout.
-  gfx::Rect contents_rect = GetContentsRectangle();
-#if defined(OS_CHROMEOS) && defined(USE_AURA)
-  html_contents_.reset(new chromeos::BalloonViewHost(balloon));
-#else
-  html_contents_.reset(new BalloonViewHost(balloon));
-#endif
-  html_contents_->SetPreferredSize(gfx::Size(10000, 10000));
-  if (enable_web_ui_)
-    html_contents_->EnableWebUI();
-
-  html_container_ = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.bounds = contents_rect;
-  html_container_->Init(params);
-  html_container_->SetContentsView(html_contents_->view());
-
-  gfx::Rect balloon_rect(x(), y(), GetTotalWidth(), GetTotalHeight());
-  frame_container_ = new Widget;
-  params.delegate = this;
-  params.transparent = true;
-  params.bounds = balloon_rect;
-  frame_container_->Init(params);
-  frame_container_->SetContentsView(this);
-  frame_container_->StackAboveWidget(html_container_);
-
-  // SetAlwaysOnTop should be called after StackAboveWidget because otherwise
-  // the top-most flag will be removed.
-  html_container_->SetAlwaysOnTop(true);
-  frame_container_->SetAlwaysOnTop(true);
-
-  close_button_->SetImage(views::CustomButton::BS_NORMAL,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE));
-  close_button_->SetImage(views::CustomButton::BS_HOT,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));
-  close_button_->SetImage(views::CustomButton::BS_PUSHED,
-                          rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));
-  close_button_->SetBoundsRect(GetCloseButtonBounds());
-  close_button_->SetBackground(SK_ColorBLACK,
-                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
-                               rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
-
-  options_menu_button_->SetIcon(*rb.GetImageSkiaNamed(IDR_BALLOON_WRENCH));
-  options_menu_button_->SetHoverIcon(
-      *rb.GetImageSkiaNamed(IDR_BALLOON_WRENCH_H));
-  options_menu_button_->SetPushedIcon(*rb.GetImageSkiaNamed(
-      IDR_BALLOON_WRENCH_P));
-  options_menu_button_->set_alignment(views::TextButton::ALIGN_CENTER);
-  options_menu_button_->set_border(NULL);
-  options_menu_button_->SetBoundsRect(GetOptionsButtonBounds());
-
-  source_label_->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
-  source_label_->SetBackgroundColor(kControlBarBackgroundColor);
-  source_label_->SetEnabledColor(kControlBarTextColor);
-  source_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  source_label_->SetBoundsRect(GetLabelBounds());
-
-  SizeContentsWindow();
-  html_container_->Show();
-  frame_container_->Show();
-
-  notification_registrar_.Add(
-    this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-    content::Source<Balloon>(balloon));
-}
-
-void BalloonViewImpl::CreateOptionsMenu() {
-  if (options_menu_model_.get())
-    return;
-  options_menu_model_.reset(new NotificationOptionsMenuModel(balloon_));
-}
-
-void BalloonViewImpl::GetContentsMask(const gfx::Rect& rect,
-                                      gfx::Path* path) const {
-  // This rounds the corners, and we also cut out a circle for the close
-  // button, since we can't guarantee the ordering of two top-most windows.
-  SkScalar radius = SkIntToScalar(views::BubbleBorder::GetCornerRadius());
-  SkScalar spline_radius = radius -
-      SkScalarMul(radius, (SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3);
-  SkScalar left = SkIntToScalar(0);
-  SkScalar top = SkIntToScalar(0);
-  SkScalar right = SkIntToScalar(rect.width());
-  SkScalar bottom = SkIntToScalar(rect.height());
-
-  path->moveTo(left, top);
-  path->lineTo(right, top);
-  path->lineTo(right, bottom - radius);
-  path->cubicTo(right, bottom - spline_radius,
-                right - spline_radius, bottom,
-                right - radius, bottom);
-  path->lineTo(left + radius, bottom);
-  path->cubicTo(left + spline_radius, bottom,
-                left, bottom - spline_radius,
-                left, bottom - radius);
-  path->lineTo(left, top);
-  path->close();
-}
-
-void BalloonViewImpl::GetFrameMask(const gfx::Rect& rect,
-                                   gfx::Path* path) const {
-  SkScalar radius = SkIntToScalar(views::BubbleBorder::GetCornerRadius());
-  SkScalar spline_radius = radius -
-      SkScalarMul(radius, (SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3);
-  SkScalar left = SkIntToScalar(rect.x());
-  SkScalar top = SkIntToScalar(rect.y());
-  SkScalar right = SkIntToScalar(rect.right());
-  SkScalar bottom = SkIntToScalar(rect.bottom());
-
-  path->moveTo(left, bottom);
-  path->lineTo(left, top + radius);
-  path->cubicTo(left, top + spline_radius,
-                left + spline_radius, top,
-                left + radius, top);
-  path->lineTo(right - radius, top);
-  path->cubicTo(right - spline_radius, top,
-                right, top + spline_radius,
-                right, top + radius);
-  path->lineTo(right, bottom);
-  path->lineTo(left, bottom);
-  path->close();
-}
-
-gfx::Point BalloonViewImpl::GetContentsOffset() const {
-  return gfx::Point(kLeftShadowWidth + kLeftMargin,
-                    kTopShadowWidth + kTopMargin);
-}
-
-int BalloonViewImpl::GetShelfHeight() const {
-  // TODO(johnnyg): add scaling here.
-  return kDefaultShelfHeight;
-}
-
-int BalloonViewImpl::GetBalloonFrameHeight() const {
-  return GetTotalHeight() - GetShelfHeight();
-}
-
-int BalloonViewImpl::GetTotalWidth() const {
-  return balloon_->content_size().width()
-      + kLeftMargin + kRightMargin + kLeftShadowWidth + kRightShadowWidth;
-}
-
-int BalloonViewImpl::GetTotalHeight() const {
-  return balloon_->content_size().height()
-      + kTopMargin + kBottomMargin + kTopShadowWidth + kBottomShadowWidth
-      + GetShelfHeight();
-}
-
-gfx::Rect BalloonViewImpl::GetContentsRectangle() const {
-  if (!frame_container_)
-    return gfx::Rect();
-
-  gfx::Size content_size = balloon_->content_size();
-  gfx::Point offset = GetContentsOffset();
-  gfx::Rect frame_rect = frame_container_->GetWindowScreenBounds();
-  return gfx::Rect(frame_rect.x() + offset.x(),
-                   frame_rect.y() + GetShelfHeight() + offset.y(),
-                   content_size.width(),
-                   content_size.height());
-}
-
-void BalloonViewImpl::OnPaint(gfx::Canvas* canvas) {
-  DCHECK(canvas);
-  // Paint the menu bar area white, with proper rounded corners.
-  gfx::Path path;
-  gfx::Rect rect = GetContentsBounds();
-  rect.set_height(GetShelfHeight());
-  GetFrameMask(rect, &path);
-
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  paint.setColor(kControlBarBackgroundColor);
-  canvas->DrawPath(path, paint);
-
-  // Draw a 1-pixel gray line between the content and the menu bar.
-  int line_width = GetTotalWidth() - kLeftMargin - kRightMargin;
-  canvas->FillRect(gfx::Rect(kLeftMargin, 1 + GetShelfHeight(), line_width, 1),
-                   kControlBarSeparatorLineColor);
-  View::OnPaint(canvas);
-  OnPaintBorder(canvas);
-}
-
-void BalloonViewImpl::OnBoundsChanged(const gfx::Rect& previous_bounds) {
-  SizeContentsWindow();
-}
-
-void BalloonViewImpl::Observe(int type,
-                              const content::NotificationSource& source,
-                              const content::NotificationDetails& details) {
-  if (type != chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED) {
-    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, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-      content::Source<Balloon>(balloon_));
-  Close(false);
-}
diff --git a/chrome/browser/ui/views/notifications/balloon_view.h b/chrome/browser/ui/views/notifications/balloon_view.h
deleted file mode 100644
index 781d69c..0000000
--- a/chrome/browser/ui/views/notifications/balloon_view.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// 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.
-
-// Draws the view for the balloons.
-
-#ifndef CHROME_BROWSER_UI_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_
-#pragma once
-
-#include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/ui/views/notifications/balloon_view_host.h"
-#include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/gfx/path.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
-#include "ui/views/controls/button/menu_button.h"
-#include "ui/views/controls/button/menu_button_listener.h"
-#include "ui/views/controls/label.h"
-#include "ui/views/view.h"
-#include "ui/views/widget/widget_delegate.h"
-
-class BalloonCollection;
-class NotificationOptionsMenuModel;
-
-namespace ui {
-class SlideAnimation;
-}
-
-namespace views {
-class ButtonListener;
-class ImageButton;
-class MenuRunner;
-}
-
-// A balloon view is the UI component for a desktop notification toasts.
-// It draws a border, and within the border an HTML renderer.
-class BalloonViewImpl : public BalloonView,
-                        public views::MenuButtonListener,
-                        public views::WidgetDelegateView,
-                        public views::ButtonListener,
-                        public content::NotificationObserver,
-                        public ui::AnimationDelegate {
- public:
-  explicit BalloonViewImpl(BalloonCollection* collection);
-  virtual ~BalloonViewImpl();
-
-  // BalloonView interface.
-  virtual void Show(Balloon* balloon) OVERRIDE;
-  virtual void Update() OVERRIDE;
-  virtual void RepositionToBalloon() OVERRIDE;
-  virtual void Close(bool by_user) OVERRIDE;
-  virtual gfx::Size GetSize() const OVERRIDE;
-  virtual BalloonHost* GetHost() const OVERRIDE;
-
-  void set_enable_web_ui(bool enable) { enable_web_ui_ = enable; }
-
- private:
-  // views::View interface.
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-
-  // views::MenuButtonListener interface.
-  virtual void OnMenuButtonClicked(views::View* source,
-                                   const gfx::Point& point) OVERRIDE;
-
-  // views::WidgetDelegate interface.
-  virtual void OnDisplayChanged() OVERRIDE;
-  virtual void OnWorkAreaChanged() OVERRIDE;
-
-  // views::ButtonListener interface.
-  virtual void ButtonPressed(
-      views::Button* sender, const views::Event&) OVERRIDE;
-
-  // content::NotificationObserver interface.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
-  // ui::AnimationDelegate interface.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-
-  // Initializes the options menu.
-  void CreateOptionsMenu();
-
-  // Masks the contents to fit within the frame.
-  void GetContentsMask(const gfx::Rect& contents_rect, gfx::Path* path) const;
-
-  // Masks the frame for the rounded corners of the shadow-bubble.
-  void GetFrameMask(const gfx::Rect&, gfx::Path* path) const;
-
-  // Adjust the contents window size to be appropriate for the frame.
-  void SizeContentsWindow();
-
-  // Do the delayed close work.
-  void DelayedClose(bool by_user);
-
-  // The height of the balloon's shelf.
-  // The shelf is where is close button is located.
-  int GetShelfHeight() const;
-
-  // The height of the part of the frame around the balloon.
-  int GetBalloonFrameHeight() const;
-
-  int GetTotalWidth() const;
-  int GetTotalHeight() const;
-
-  gfx::Rect GetCloseButtonBounds() const;
-  gfx::Rect GetOptionsButtonBounds() const;
-  gfx::Rect GetLabelBounds() const;
-
-  // Where the balloon contents should be placed with respect to the top left
-  // of the frame.
-  gfx::Point GetContentsOffset() const;
-
-  // Where the balloon contents should be in screen coordinates.
-  gfx::Rect GetContentsRectangle() const;
-
-  // Non-owned pointer to the balloon which owns this object.
-  Balloon* balloon_;
-
-  // Non-owned pointer to the balloon collection this is a part of.
-  BalloonCollection* collection_;
-
-  // The window that contains the frame of the notification.
-  // Pointer owned by the View subclass.
-  views::Widget* frame_container_;
-
-  // The window that contains the contents of the notification.
-  // Pointer owned by the View subclass.
-  views::Widget* html_container_;
-
-  // The renderer of the HTML contents.
-  scoped_ptr<BalloonViewHost> html_contents_;
-
-  // The following factory is used to call methods at a later time.
-  base::WeakPtrFactory<BalloonViewImpl> method_factory_;
-
-  // Pointer to sub-view is owned by the View sub-class.
-  views::ImageButton* close_button_;
-
-  // Pointer to sub-view is owned by View class.
-  views::Label* source_label_;
-
-  // An animation to move the balloon on the screen as its position changes.
-  scoped_ptr<ui::SlideAnimation> animation_;
-  gfx::Rect anim_frame_start_;
-  gfx::Rect anim_frame_end_;
-
-  // The options menu.
-  scoped_ptr<NotificationOptionsMenuModel> options_menu_model_;
-  scoped_ptr<views::MenuRunner> menu_runner_;
-  views::MenuButton* options_menu_button_;
-
-  content::NotificationRegistrar notification_registrar_;
-
-  // Set to true if this is browser generate web UI.
-  bool enable_web_ui_;
-
-  DISALLOW_COPY_AND_ASSIGN(BalloonViewImpl);
-};
-
-#endif  // CHROME_BROWSER_UI_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_