Fix for Ash shortcuts unexpectedly working in system model dialog

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 2f08927ccab2034a515ff1cb8a4bf41642431dee..4d202bbcc7fc768abd0fa8776cab92f0e8e37ce2 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 modalWindowOpen) {

[Daniel Erat, 2012/10/16 03:03:50]

s/modalWindowOpen/modal_window_open/

[sschmitz, 2012/10/16 18:18:23]

Done.

+    simulate_modal_window_open_for_testing_ = modalWindowOpen;
+  }
+
   // 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);
 };