Fix for Ash shortcuts unexpectedly working in system model dialog

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4375e180bb730b2355603b43ab96efae16b0e93a..1c1906ff1dfb2e08036d3928fa4b2abc58b924a5 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -184,7 +184,8 @@ Shell::Shell(ShellDelegate* delegate)
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
-      browser_context_(NULL) {
+      browser_context_(NULL),
+      simulate_modal_window_open_for_testing_(false) {
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_.get());
   ui_controls::InstallUIControlsAura(internal::CreateUIControls());
@@ -528,6 +529,7 @@ bool Shell::IsScreenLocked() const {
 }
 
 bool Shell::IsModalWindowOpen() const {
+  if (simulate_modal_window_open_for_testing_) return true;

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

move "return true" to the next line, indented two spaces beyond this one

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

Done.

   // TODO(oshima): Walk though all root windows.
   const aura::Window* modal_container = GetContainer(
       GetPrimaryRootWindow(),