diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 20:40:32 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 20:40:32 +0000 |
| commit | 0238c6202d949f39c78e21620482db16783f5605 (patch) | |
| tree | 98de0e762ddf10e0b3fac33db4c85cc565618d0c /ash/magnifier | |
| parent | b82f0f348a9f6644a7f031d9a0526f83ca44c8b5 (diff) | |
| download | chromium_src-0238c6202d949f39c78e21620482db16783f5605.zip chromium_src-0238c6202d949f39c78e21620482db16783f5605.tar.gz chromium_src-0238c6202d949f39c78e21620482db16783f5605.tar.bz2 | |
Revert of [Refactor] Consolidate the logic for whether a widget can be activated. (https://codereview.chromium.org/286733002/)
Reason for revert:
This CL was causing problems when the value of views::Widget::CanActivate() changes crbug.com/374095
I also need to audit the code to find out whether there are any 'non-activatable' widgets which were intended to be activatable
Original issue's description:
> [Refactor] Consolidate the logic for whether a widget can be activated.
>
> This is a first step towards giving tooltips their own WindowTreeHosts on Linux.
>
> BUG=353533
> TEST=None
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270597
Review URL: https://codereview.chromium.org/297503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/partial_magnification_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/magnifier/partial_magnification_controller.cc b/ash/magnifier/partial_magnification_controller.cc index 7f1d92e..38bf7f4 100644 --- a/ash/magnifier/partial_magnification_controller.cc +++ b/ash/magnifier/partial_magnification_controller.cc @@ -144,7 +144,7 @@ void PartialMagnificationController::CreateMagnifierWindow() { zoom_widget_ = new views::Widget; views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.activatable = views::Widget::InitParams::ACTIVATABLE_NO; + params.can_activate = false; params.accept_events = false; params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; params.parent = root_window; |