Re-land:

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.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/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
@@ skipping 99 matching lines @@
     gfx::Insets insets(h, w, h, w);
     return views::Painter::CreateImagePainter(*image, insets, true);
   }
 
   scoped_ptr<views::Painter> border_painter_;
   scoped_ptr<views::Painter> border_pushed_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(OptInButtonBorder);
 };
 
+gfx::NativeView GetRelativeWindowForPopup(gfx::NativeView edit_native_view) {
+#if defined(OS_WIN)
+  // When an IME is attached to the rich-edit control, retrieve its window
+  // handle and show this popup window under the IME windows.
+  // Otherwise, show this popup window under top-most windows.
+  // TODO(hbono): http://b/1111369 if we exclude this popup window from the
+  // display area of IME windows, this workaround becomes unnecessary.
+  HWND ime_window = ImmGetDefaultIMEWnd(edit_native_view);
+  return ime_window ? ime_window : HWND_NOTOPMOST;
+#elif defined(TOOLKIT_USES_GTK)
+  GtkWidget* toplevel = gtk_widget_get_toplevel(edit_native_view);
+  DCHECK(GTK_WIDGET_TOPLEVEL(toplevel));
+  return toplevel;
+#endif
+}
+
 }  // namespace
 
+class AutocompletePopupContentsView::AutocompletePopupWidget
+    : public views::Widget,
+      public base::SupportsWeakPtr<AutocompletePopupWidget> {
+ public:
+  AutocompletePopupWidget() {}
+  virtual ~AutocompletePopupWidget() {}
+
+ private:
+   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
+};
+
 class AutocompletePopupContentsView::InstantOptInView
     : public views::View,
       public views::ButtonListener {
  public:
   InstantOptInView(AutocompletePopupContentsView* contents_view,
                    const gfx::Font& label_font,
                    const gfx::Font& button_font)
       : contents_view_(contents_view),
         bg_painter_(views::Painter::CreateVerticalGradient(
                         SkColorSetRGB(255, 242, 183),
@@ skipping 189 matching lines @@
   // If we're animating and our target height changes, reset the animation.
   // NOTE: If we just reset blindly on _every_ update, then when the user types
   // rapidly we could get "stuck" trying repeatedly to animate shrinking by the
   // last few pixels to get to one visible result.
   if (new_target_bounds.height() != target_bounds_.height())
     size_animation_.Reset();
   target_bounds_ = new_target_bounds;
 
   if (popup_ == NULL) {
     // If the popup is currently closed, we need to create it.
-    popup_ = (new AutocompletePopupClass)->AsWeakPtr();
+    popup_ = (new AutocompletePopupWidget)->AsWeakPtr();
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
     params.can_activate = false;
     params.transparent = true;
     params.parent = location_bar_->GetWidget()->GetNativeView();
     params.bounds = GetPopupBounds();
-    popup_->GetWidget()->Init(params);
+    popup_->Init(params);
     popup_->SetContentsView(this);
-    popup_->MoveAbove(popup_->GetRelativeWindowForPopup(
-        omnibox_view_->GetNativeView()));
+    popup_->MoveAbove(
+        GetRelativeWindowForPopup(omnibox_view_->GetNativeView()));
     popup_->Show();
   } else {
     // Animate the popup shrinking, but don't animate growing larger since that
     // would make the popup feel less responsive.
     start_bounds_ = GetWidget()->GetWindowScreenBounds();
     if (target_bounds_.height() < start_bounds_.height())
       size_animation_.Show();
     else
       start_bounds_ = target_bounds_;
     popup_->SetBounds(GetPopupBounds());
@@ skipping 324 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWindow()->GetNativeWindow(), model_->profile());
   }
   UpdatePopupAppearance();
 }