diff options
| author | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 20:48:00 +0000 |
|---|---|---|
| committer | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 20:48:00 +0000 |
| commit | 93872b09aa5a4f2b2f114f808e702b465883fd9a (patch) | |
| tree | db25b958ff8b0110348ce3d8992a12b2aa4ad4b3 /ash/shell.h | |
| parent | 7a137c9deed67a943c21f82d0a9c71112da5d603 (diff) | |
| download | chromium_src-93872b09aa5a4f2b2f114f808e702b465883fd9a.zip chromium_src-93872b09aa5a4f2b2f114f808e702b465883fd9a.tar.gz chromium_src-93872b09aa5a4f2b2f114f808e702b465883fd9a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 2f08927..dbcc2fd 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -214,6 +214,11 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{ // Returns true if a modal dialog window is currently open. bool IsModalWindowOpen() const; + // For testing only: set simulation that a modal window is open + void SimulateModalWindowOpenForTesting(bool modal_window_open) { + simulate_modal_window_open_for_testing_ = modal_window_open; + } + // Creates a default views::NonClientFrameView for use by windows in the // Ash environment. views::NonClientFrameView* CreateDefaultNonClientFrameView( @@ -494,6 +499,9 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{ // Used by ash/shell. content::BrowserContext* browser_context_; + // For testing only: simulate that a modal window is open + bool simulate_modal_window_open_for_testing_; + DISALLOW_COPY_AND_ASSIGN(Shell); }; |