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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 11192016: Revert 162240 - See also: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 162263)
+++ ash/shell.cc (working copy)
@@ -186,8 +186,7 @@
output_configurator_animation_(
new internal::OutputConfiguratorAnimation()),
#endif // defined(OS_CHROMEOS)
- browser_context_(NULL),
- simulate_modal_window_open_for_testing_(false) {
+ browser_context_(NULL) {
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_ALTERNATE, screen_.get());
ui_controls::InstallUIControlsAura(internal::CreateUIControls());
@@ -539,8 +538,6 @@
}
bool Shell::IsModalWindowOpen() const {
- if (simulate_modal_window_open_for_testing_)
- return true;
// TODO(oshima): Walk though all root windows.
const aura::Window* modal_container = GetContainer(
GetPrimaryRootWindow(),
« no previous file with comments | « ash/shell.h ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698