diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 22:53:59 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-27 22:53:59 +0000 |
| commit | 2c2af24265242265d988fe196a627baf8c8fcddf (patch) | |
| tree | f2819e73584e93437fcd063abc26675b2e39eee8 /ash | |
| parent | 9e6375b5c229b03a21df5e48958d66c07880bd6f (diff) | |
| download | chromium_src-2c2af24265242265d988fe196a627baf8c8fcddf.zip chromium_src-2c2af24265242265d988fe196a627baf8c8fcddf.tar.gz chromium_src-2c2af24265242265d988fe196a627baf8c8fcddf.tar.bz2 | |
Revert 185029
We see a ton of browser_tests timeouts on windows.
http://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/20141
I notice this change didn't run browser_tests on any non-Aura windows boxes.
And it removes a keyboard item from windows.
Working theory:
maybe some browsers tests are sending that particular key that isn't around any more on windows and waiting for something to happen and waiting forever.
Reverting to test the theory.
Apologies if the theory turns out wrong. :-|
> Remove the Exit menu item from the Wrench menu in Win/Ash.
>
> Relanding after a revert in crrev.com/184662 due to accidentally disabling the Exit menu on non Win-Ash platforms.
>
> This patch is identical to patch set 4 in https://codereview.chromium.org/12330056/
>
> BUG=176130
> TEST=Metro/Ash chrome browsers lose their Exit menu item.
> TBR=cpu, sky
>
> Review URL: https://chromiumcodereview.appspot.com/12340110
TBR=robertshield@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index a5fe803..ccc574d 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -860,11 +860,9 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) { #endif // OS_LINUX #endif // !NDEBUG -#if !defined(OS_WIN) // Exit EXPECT_TRUE(ProcessWithContext( ui::Accelerator(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); -#endif // New tab EXPECT_TRUE(ProcessWithContext( diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index 94111f8..ebf8cbe 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -86,9 +86,7 @@ const AcceleratorData kAcceleratorData[] = { DISABLE_GPU_WATCHDOG }, #endif // defined(OS_CHROMEOS) { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, -#if !defined(OS_WIN) { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, -#endif { true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_SPOKEN_FEEDBACK }, { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |