Change type of touch selection handles to POPUP

ui/views/touchui/touch_selection_controller_impl.cc

 // Copyright (c) 2013 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 "ui/views/touchui/touch_selection_controller_impl.h"
 
 #include "base/time/time.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 47 matching lines @@
 
 const int kContextMenuTimoutMs = 200;
 
 const int kSelectionHandleQuickFadeDurationMs = 50;
 
 // Creates a widget to host SelectionHandleView.
 views::Widget* CreateTouchSelectionPopupWidget(
     gfx::NativeView context,
     views::WidgetDelegate* widget_delegate) {
   views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_TOOLTIP);
+  views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.can_activate = false;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.context = context;
+  params.parent = context;
   params.delegate = widget_delegate;
   widget->Init(params);
   SetShadowType(widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
+  // A transient child is not stacked above its parent upon creation; so, we
+  // do it manually here.
+  // TODO(mohsen): Remove after the above bug is fixed in the transient window
+  // management: crbug.com/352371.
+  widget->GetNativeView()->parent()->StackChildAbove(widget->GetNativeView(),
+                                                     context);
   return widget;
 }
 
 gfx::Image* GetHandleImage() {
   static gfx::Image* handle_image = NULL;
   if (!handle_image) {
     handle_image = &ui::ResourceBundle::GetSharedInstance().GetImageNamed(
         IDR_TEXT_SELECTION_HANDLE);
   }
   return handle_image;
@@ skipping 51 matching lines @@
 class TouchSelectionControllerImpl::EditingHandleView
     : public views::WidgetDelegateView {
  public:
   EditingHandleView(TouchSelectionControllerImpl* controller,
                     gfx::NativeView context)
       : controller_(controller),
         drag_offset_(0),
         draw_invisible_(false) {
     widget_.reset(CreateTouchSelectionPopupWidget(context, this));
     widget_->SetContentsView(this);
-    widget_->SetAlwaysOnTop(true);
 
     aura::Window* window = widget_->GetNativeWindow();
     window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(
         new TouchHandleWindowTargeter(window, this)));
 
     // We are owned by the TouchSelectionController.
     set_owned_by_client();
   }
 
   virtual ~EditingHandleView() {
@@ skipping 389 matching lines @@
   StartContextMenuTimer();
 }
 
 void TouchSelectionControllerImpl::HideContextMenu() {
   if (context_menu_)
     context_menu_->Close();
   context_menu_ = NULL;
   context_menu_timer_.Stop();
 }
 
+gfx::NativeView TouchSelectionControllerImpl::GetCursorHandleNativeView() {
+  return cursor_handle_->GetWidget()->GetNativeView();
+}
+
 gfx::Point TouchSelectionControllerImpl::GetSelectionHandle1Position() {
   return selection_handle_1_->GetScreenPosition();
 }
 
 gfx::Point TouchSelectionControllerImpl::GetSelectionHandle2Position() {
   return selection_handle_2_->GetScreenPosition();
 }
 
 gfx::Point TouchSelectionControllerImpl::GetCursorHandlePosition() {
   return cursor_handle_->GetScreenPosition();
@@ skipping 15 matching lines @@
 }
 
 ui::TouchSelectionController* ViewsTouchSelectionControllerFactory::create(
     ui::TouchEditable* client_view) {
   if (switches::IsTouchEditingEnabled())
     return new views::TouchSelectionControllerImpl(client_view);
   return NULL;
 }
 
 }  // namespace views