summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorafakhry <afakhry@chromium.org>2016-03-09 13:43:51 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-09 21:45:15 +0000
commit1eeae89ed794769fba4fe6b53e3d3250ca20d261 (patch)
treebba718a6f7890299809533760422a9c838707f7f /ash
parenta69b2e6ecb2e136c8eca57176233460a334e20da (diff)
downloadchromium_src-1eeae89ed794769fba4fe6b53e3d3250ca20d261.zip
chromium_src-1eeae89ed794769fba4fe6b53e3d3250ca20d261.tar.gz
chromium_src-1eeae89ed794769fba4fe6b53e3d3250ca20d261.tar.bz2
Fix Starting the feedback app.
The accelerator for starting the feedback app should be non-repeatable. We should only request system information once the UI is shown not before, and limit doing the initialization only to when we determine we need to create a new feedback window. R=rkc@chromium.org BUG=590892 TEST=manually Review URL: https://codereview.chromium.org/1780553002 Cr-Commit-Position: refs/heads/master@{#380230}
Diffstat (limited to 'ash')
-rw-r--r--ash/accelerators/accelerator_table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index bb443e6..1c6c9c8 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -435,8 +435,8 @@ const AcceleratorAction kNonrepeatableActions[] = {
// TODO(mazda): Add other actions which should not be repeated.
CYCLE_BACKWARD_MRU,
CYCLE_FORWARD_MRU,
- TOGGLE_OVERVIEW,
EXIT,
+ OPEN_FEEDBACK_PAGE,
PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down.
ROTATE_SCREEN,
ROTATE_WINDOW,
@@ -447,6 +447,7 @@ const AcceleratorAction kNonrepeatableActions[] = {
TAKE_SCREENSHOT,
TOGGLE_FULLSCREEN,
TOGGLE_MAXIMIZED,
+ TOGGLE_OVERVIEW,
WINDOW_MINIMIZE,
#if defined(OS_CHROMEOS)
DEBUG_TOGGLE_TOUCH_PAD,