Re-land:

chrome/browser/ui/views/tabs/dragged_tab_controller.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/ui/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 185 matching lines @@
  public:
   DockDisplayer(DraggedTabController* controller,
                 const DockInfo& info)
       : controller_(controller),
         popup_(NULL),
         popup_view_(NULL),
         ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)),
         hidden_(false),
         in_enable_area_(info.in_enable_area()) {
 #if defined(OS_WIN)
-    popup_ = views::Widget::CreateWidget();
-    popup_->SetOpacity(0x00);
+    popup_ = new views::Widget;
     // TODO(sky): This should "just work" on Gtk now.
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     params.transparent = true;
     params.keep_on_top = true;
     params.bounds = info.GetPopupRect();
     popup_->Init(params);
     popup_->SetContentsView(new DockView(info.type()));
+    popup_->SetOpacity(0x00);
     if (info.in_enable_area())
       animation_.Reset(1);
     else
       animation_.Show();
     popup_->Show();
 #else
     NOTIMPLEMENTED();
 #endif
     popup_view_ = popup_->GetNativeView();
   }
@@ skipping 33 matching lines @@
     animation_.Hide();
   }
 
   virtual void AnimationProgressed(const ui::Animation* animation) {
     UpdateLayeredAlpha();
   }
 
   virtual void AnimationEnded(const ui::Animation* animation) {
     if (!hidden_)
       return;
-#if defined(OS_WIN)
-    static_cast<views::WidgetWin*>(popup_)->Close();
-#else
-    NOTIMPLEMENTED();
-#endif
+    popup_->Close();
     delete this;
   }
 
   virtual void UpdateLayeredAlpha() {
-#if defined(OS_WIN)
     double scale = in_enable_area_ ? 1 : .5;
-    static_cast<views::WidgetWin*>(popup_)->SetOpacity(
-        static_cast<BYTE>(animation_.GetCurrentValue() * scale * 255.0));
+    popup_->SetOpacity(static_cast<unsigned char>(animation_.GetCurrentValue() *
+        scale * 255.0));
     popup_->GetRootView()->SchedulePaint();
-#else
-    NOTIMPLEMENTED();
-#endif
   }
 
  private:
   // DraggedTabController that created us.
   DraggedTabController* controller_;
 
   // Window we're showing.
   views::Widget* popup_;
 
   // NativeView of |popup_|. We cache this to avoid the possibility of
@@ skipping 1153 matching lines @@
 
 bool DraggedTabController::AreTabsConsecutive() {
   for (size_t i = 1; i < drag_data_.size(); ++i) {
     if (drag_data_[i - 1].source_model_index + 1 !=
         drag_data_[i].source_model_index) {
       return false;
     }
   }
   return true;
 }