Ensure that the main window does not render as deactivated when the link disambiguation bubble is d…

chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

 // Copyright (c) 2014 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/link_disambiguation/link_disambiguation_popup.h"
 
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/events/event.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/gesture_event_details.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/image_view.h"
 
 class LinkDisambiguationPopup::ZoomBubbleView
     : public views::BubbleDelegateView {
  public:
-  ZoomBubbleView(const gfx::Rect& target_rect,
+  ZoomBubbleView(views::Widget* top_level_widget,
+                 const gfx::Rect& target_rect,
                  const gfx::ImageSkia* zoomed_skia_image,
                  const aura::Window* content,
                  LinkDisambiguationPopup* popup,
                  const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
                  const base::Callback<void(ui::MouseEvent*)>& mouse_cb);
 
   void Close();
 
  private:
   // views::View overrides
   virtual gfx::Size GetPreferredSize() const override;
   virtual void OnGestureEvent(ui::GestureEvent* event) override;
   virtual void OnMouseEvent(ui::MouseEvent* event) override;
 
   // WidgetObserver overrides
   virtual void OnWidgetClosing(views::Widget* widget) override;
 
   const float scale_;
   const aura::Window* content_;
   const base::Callback<void(ui::GestureEvent*)> gesture_cb_;
   const base::Callback<void(ui::MouseEvent*)> mouse_cb_;
   LinkDisambiguationPopup* popup_;
   const gfx::Rect target_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomBubbleView);
 };
 
 LinkDisambiguationPopup::ZoomBubbleView::ZoomBubbleView(
+    views::Widget* top_level_widget,
     const gfx::Rect& target_rect,
     const gfx::ImageSkia* zoomed_skia_image,
     const aura::Window* content,
     LinkDisambiguationPopup* popup,
     const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
     const base::Callback<void(ui::MouseEvent*)>& mouse_cb)
-    : BubbleDelegateView(NULL, views::BubbleBorder::FLOAT),
+    : BubbleDelegateView(
+          top_level_widget ? top_level_widget->GetContentsView() : NULL,

[sky, 2014/10/25 15:22:43]

NULL->nullptr

[ananta, 2014/10/27 19:19:59]

Done.

+          views::BubbleBorder::FLOAT),
       scale_(static_cast<float>(zoomed_skia_image->width()) /
           static_cast<float>(target_rect.width())),
       content_(content),
       gesture_cb_(gesture_cb),
       mouse_cb_(mouse_cb),
       popup_(popup),
       target_rect_(target_rect) {
   views::ImageView* image_view = new views::ImageView();
   image_view->SetBounds(
       0, 0, zoomed_skia_image->width(), zoomed_skia_image->height());
@@ skipping 74 matching lines @@
 LinkDisambiguationPopup::LinkDisambiguationPopup()
     : content_(NULL),
       view_(NULL) {
 }
 
 LinkDisambiguationPopup::~LinkDisambiguationPopup() {
   Close();
 }
 
 void LinkDisambiguationPopup::Show(
+    views::Widget* top_level_widget,
     const SkBitmap& zoomed_bitmap,
     const gfx::Rect& target_rect,
     const gfx::NativeView content,
     const base::Callback<void(ui::GestureEvent*)>& gesture_cb,
     const base::Callback<void(ui::MouseEvent*)>& mouse_cb) {
   content_ = content;
 
   view_ = new ZoomBubbleView(
+      top_level_widget,
       target_rect,
       gfx::Image::CreateFrom1xBitmap(zoomed_bitmap).ToImageSkia(),
       content_,
       this,
       gesture_cb,
       mouse_cb);
 
   // Center the zoomed bubble over the target rectangle, constrained to the
   // work area in the current display. Since |target_rect| is provided in
   // |content_| coordinate system, we must convert it into Screen coordinates
@@ skipping 19 matching lines @@
 void LinkDisambiguationPopup::Close() {
   if (view_) {
     view_->Close();
     view_ = NULL;
   }
 }
 
 void LinkDisambiguationPopup::InvalidateBubbleView() {
   view_ = NULL;
 }