Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Issue 11192016: Revert 162240 - See also: (Closed)

Created:
8 years, 2 months ago by mattm
Modified:
8 years, 2 months ago
Reviewers:
sschmitz
CC:
chromium-reviews, sadrul, yusukes+watch_chromium.org, derat+watch_chromium.org, ben+watch_chromium.org, mazda+watch_chromium.org, oshima+watch_chromium.org, stevenjb+watch_chromium.org, davemoore+watch_chromium.org, nkostylev+watch_chromium.org
Visibility:
Public.

Description

Revert 162240 - See also: http://code.google.com/p/chromium/issues/detail?id=134093 https://chromiumcodereview.appspot.com/10993067/ This is a better fix than 10993067. This CL undoes that change and moves the fix to the AcceleratorController. This is a more general fix which employs a table of actions that are allowed when in a modal dialog. All other actions are suppressed. BUG=153077 TEST=System Tray -> Ehternet -> Join Other; while the modal dialog is up, try various ash shortcuts. Observe that the ones are working (like volume up) make sense, but things like new window or moving around windows are inactive. Review URL: https://chromiumcodereview.appspot.com/10977088 TBR=sschmitz@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=162264

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+11 lines, -222 lines) Patch
M ash/accelerators/accelerator_controller.h View 1 chunk +0 lines, -2 lines 0 comments Download
M ash/accelerators/accelerator_controller.cc View 2 chunks +7 lines, -14 lines 0 comments Download
M ash/accelerators/accelerator_controller_unittest.cc View 1 chunk +0 lines, -142 lines 0 comments Download
M ash/accelerators/accelerator_table.h View 1 chunk +0 lines, -6 lines 0 comments Download
M ash/accelerators/accelerator_table.cc View 1 chunk +0 lines, -37 lines 0 comments Download
M ash/accelerators/accelerator_table_unittest.cc View 1 chunk +0 lines, -9 lines 0 comments Download
M ash/shell.h View 2 chunks +0 lines, -8 lines 0 comments Download
M ash/shell.cc View 2 chunks +1 line, -4 lines 0 comments Download
M chrome/browser/chromeos/options/wifi_config_view.cc View 3 chunks +3 lines, -0 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
mattm
8 years, 2 months ago (2012-10-16 22:10:45 UTC) #1
mattm
8 years, 2 months ago (2012-10-16 22:11:30 UTC) #2
http://build.chromium.org/p/chromium.win/builders/Win%20Aura/builds/23597/ste...

[ RUN      ] AcceleratorControllerTest.DisallowedAtModalWindow
[5820:5436:1016/142221:1186824:ERROR:cursor_loader_win.cc(85)] NOT IMPLEMENTED
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
0
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
1
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
17
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
18
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
21
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
22
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
32
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
33
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
49
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
51
accelerators\accelerator_controller_unittest.cc(1048): error: Value of:
allActions.find(*it) == allActions.end()
  Actual: true
Expected: false
 action from kActionsAllowedAtModalWindow not found in kAcceleratorData. action:
61
[5820:5436:1016/142221:1186918:ERROR:root_window_host_win.cc(213)] NOT
IMPLEMENTED
[  FAILED  ] AcceleratorControllerTest.DisallowedAtModalWindow (109 ms)
[----------] 12 tests from AcceleratorControllerTest (1185 ms total)

Powered by Google App Engine
This is Rietveld 408576698