| Index: ui/views/touchui/touch_selection_controller_impl.cc
|
| diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
|
| index 9796c770bc9c47640ec69c64bd7e724bb217d1fd..1ac2a64124a742b44339d9f6be79c8498cd6f7c9 100644
|
| --- a/ui/views/touchui/touch_selection_controller_impl.cc
|
| +++ b/ui/views/touchui/touch_selection_controller_impl.cc
|
| @@ -65,14 +65,20 @@ 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;
|
| }
|
|
|
| @@ -144,7 +150,6 @@ class TouchSelectionControllerImpl::EditingHandleView
|
| 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>(
|
| @@ -554,6 +559,10 @@ void TouchSelectionControllerImpl::HideContextMenu() {
|
| context_menu_timer_.Stop();
|
| }
|
|
|
| +gfx::NativeView TouchSelectionControllerImpl::GetCursorHandleNativeView() {
|
| + return cursor_handle_->GetWidget()->GetNativeView();
|
| +}
|
| +
|
| gfx::Point TouchSelectionControllerImpl::GetSelectionHandle1Position() {
|
| return selection_handle_1_->GetScreenPosition();
|
| }
|
|
|