diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 07:03:06 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 07:03:06 +0000 |
| commit | b3c8d985d604d6b66941f89bf4c2111e0a4058f8 (patch) | |
| tree | c17a7ac1c75905683e1abf18bd1604c37124ef47 /ash/display/display_controller.cc | |
| parent | 2c116b7d0258cab56a49c1d30a813d55524633ad (diff) | |
| download | chromium_src-b3c8d985d604d6b66941f89bf4c2111e0a4058f8.zip chromium_src-b3c8d985d604d6b66941f89bf4c2111e0a4058f8.tar.gz chromium_src-b3c8d985d604d6b66941f89bf4c2111e0a4058f8.tar.bz2 | |
Enable extended desktop by default.
Added debug only shortcut to activate screen locker.
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10800095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_controller.cc')
| -rw-r--r-- | ash/display/display_controller.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index c0efb51..a4807ae 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -19,10 +19,6 @@ namespace ash { namespace internal { -namespace { -// True if the extended desktop mode is enabled. -bool extended_desktop_enabled = false; -} // namespace DisplayController::DisplayController() : secondary_display_layout_(RIGHT) { @@ -233,14 +229,10 @@ void DisplayController::OnDisplayRemoved(const gfx::Display& display) { // static bool DisplayController::IsExtendedDesktopEnabled(){ - return extended_desktop_enabled || + static bool extended_desktop_disabled = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshExtendedDesktop); -} - -// static -void DisplayController::SetExtendedDesktopEnabled(bool enabled) { - extended_desktop_enabled = enabled; + switches::kAshExtendedDesktopDisabled); + return !extended_desktop_disabled; } aura::RootWindow* DisplayController::AddRootWindowForDisplay( |