Re-land:

chrome/browser/chromeos/notifications/notification_panel.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.
 
 // Draws the view for the balloons.
 
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 
 #include <algorithm>
 
@@ skipping 54 matching lines @@
 #endif
 
 chromeos::BalloonViewImpl* GetBalloonViewOf(const Balloon* balloon) {
   return static_cast<chromeos::BalloonViewImpl*>(balloon->view());
 }
 
 // A Widget that covers entire ScrollView's viewport. Without this, all
 // renderer's native gtk widgets are moved one by one via
 // View::VisibleBoundsInRootChanged() notification, which makes scrolling not
 // smooth.
-// TODO: this should subclass Widget and not WidgetGtk.
-class ViewportWidget : public views::WidgetGtk {
+class ViewportWidget : public views::Widget {
  public:
   explicit ViewportWidget(chromeos::NotificationPanel* panel)
       : panel_(panel),
         pointer_inside_panel_(false) {
   }
 
   void UpdateControl() {
     if (pointer_inside_panel_)
       panel_->OnMouseMotion(last_point_);
   }
@@ skipping 331 matching lines @@
 
 NotificationPanel::~NotificationPanel() {
   Hide();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NottificationPanel public.
 
 void NotificationPanel::Show() {
   if (!panel_widget_) {
-    panel_widget_ = views::Widget::CreateWidget();
+    panel_widget_ = new views::Widget;
     // TODO(oshima): Using window because Popup widget behaves weird
     // when resizing. This needs to be investigated.
     Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
     // Enable double buffering because the panel has both pure views
     // control and native controls (scroll bar).
     params.double_buffer = true;
 
     gfx::Rect bounds = GetPreferredBounds();
     bounds = bounds.Union(min_bounds_);
     params.bounds = bounds;
     panel_widget_->Init(params);
     // Set minimum bounds so that it can grow freely.
     gtk_widget_set_size_request(GTK_WIDGET(panel_widget_->GetNativeView()),
                                 min_bounds_.width(), min_bounds_.height());
 
     views::NativeViewHost* native = new views::NativeViewHost();
     scroll_view_->SetContents(native);
 
     panel_widget_->SetContentsView(scroll_view_.get());
 
     // Add the view port after scroll_view is attached to the panel widget.
-    ViewportWidget* widget = new ViewportWidget(this);
-    container_host_ = widget;
+    ViewportWidget* viewport_widget = new ViewportWidget(this);
+    container_host_ = viewport_widget;
     container_host_->Init(
         views::Widget::InitParams(views::Widget::InitParams::TYPE_CONTROL));
     container_host_->SetContentsView(balloon_container_.get());
     // The window_contents_ is onwed by the Widget. Increase ref count
     // so that window_contents does not get deleted when detached.
-    g_object_ref(widget->window_contents());
-    native->Attach(widget->window_contents());
+    g_object_ref(viewport_widget->GetNativeView());
+    native->Attach(viewport_widget->GetNativeView());
 
     UnregisterNotification();
     panel_controller_.reset(
         new PanelController(this, GTK_WINDOW(panel_widget_->GetNativeView())));
     panel_controller_->Init(false /* don't focus when opened */,
                             gfx::Rect(0, 0, kBalloonMinWidth, 1), 0,
                             WM_IPC_PANEL_USER_RESIZE_VERTICALLY);
     registrar_.Add(this, NotificationType::PANEL_STATE_CHANGED,
                    Source<PanelController>(panel_controller_.get()));
   }
@@ skipping 389 matching lines @@
                                   &origin);
   return rect.Contains(gfx::Rect(origin, view->size()));
 }
 
 
 bool NotificationPanelTester::IsActive(const BalloonViewImpl* view) const {
   return panel_->active_ == view;
 }
 
 }  // namespace chromeos