Fix for Ash shortcuts unexpectedly working in system model dialog

ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 196 matching lines @@
 
   // Returns app list window or NULL if it is not visible.
   aura::Window* GetAppListWindow();
 
   // Returns true if the screen is locked.
   bool IsScreenLocked() const;
 
   // 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(
       views::Widget* widget);
 
   // Rotates focus through containers that can receive focus.
   void RotateFocus(Direction direction);
 
   // Sets the work area insets of the display that contains |window|,
   // this notifies observers too.
@@ skipping 260 matching lines @@
       output_configurator_animation_;
 #endif  // defined(OS_CHROMEOS)
 
   CursorManager cursor_manager_;
 
   ObserverList<ShellObserver> observers_;
 
   // 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);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_