summaryrefslogtreecommitdiffstats
path: root/ash/accelerators
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 22:59:07 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 22:59:07 +0000
commit4f2542396a985f39164151e369e36606b967ed2d (patch)
treea17c6d65d42409b50629f9654070af873757e5fa /ash/accelerators
parente7a7a2365fb9de66f499156737c4a7ac574cb3ef (diff)
downloadchromium_src-4f2542396a985f39164151e369e36606b967ed2d.zip
chromium_src-4f2542396a985f39164151e369e36606b967ed2d.tar.gz
chromium_src-4f2542396a985f39164151e369e36606b967ed2d.tar.bz2
Revert 271468 "Revert of [Refactor] Consolidate the logic for wh..."
The revert broke Windows interactive_ui_tests. The world has probably changed since this was first committed. WidgetTestInteractive.CanActivateFlagIsHonored http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/29193/steps/interactive_ui_tests/logs/stdio > 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 TBR=pkotwicz@chromium.org Review URL: https://codereview.chromium.org/291013003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
-rw-r--r--ash/accelerators/exit_warning_handler.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/accelerators/exit_warning_handler.cc
index 056e32d..b3409e5 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/accelerators/exit_warning_handler.cc
@@ -187,7 +187,6 @@ void ExitWarningHandler::Show() {
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.accept_events = false;
- params.can_activate = false;
params.keep_on_top = true;
params.remove_standard_frame = true;
params.delegate = delegate;