Flip the software mirroring flag to disable the feature.

 I'll land this after https://codereview.chromium.org/16232013/ lands.

BUG=239776
TEST=none

Review URL: https://chromiumcodereview.appspot.com/16392008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205162 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 14e9064..ab46df4 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -60,6 +60,11 @@ const char kAshDisableImmersiveFullscreen[] =
 // Disables ui scaling.
 const char kAshDisableUIScaling[] = "ash-disable-ui-scaling";
 
+#if defined(OS_CHROMEOS)
+// Disable compositor based mirroring.
+const char kAshDisableSoftwareMirroring[] = "ash-disable-software-mirroring";
+#endif
+
 // Extend the status tray volume item to allow the user to choose an audio
 // input and output device.
 const char kAshEnableAudioDeviceMenu[] =
@@ -75,11 +80,6 @@ const char kAshEnableBrightnessControl[] = "ash-enable-brightness-control";
 // Enable immersive fullscreen mode, regardless of default setting.
 const char kAshEnableImmersiveFullscreen[] = "ash-enable-immersive-fullscreen";
 
-#if defined(OS_CHROMEOS)
-// Enable compositor based mirroring.
-const char kAshEnableSoftwareMirroring[] = "ash-enable-software-mirroring";
-#endif
-
 #if defined(OS_LINUX)
 // Enable memory monitoring.
 const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 29d3929..a112592 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -31,12 +31,12 @@ ASH_EXPORT extern const char kAshDisablePerAppLauncher[];
 ASH_EXPORT extern const char kAshDisableUIScaling[];
 ASH_EXPORT extern const char kAshDisableDisplayRotation[];
 ASH_EXPORT extern const char kAshDisableDragAndDropAppListToLauncher[];
+#if defined(OS_CHROMEOS)
+ASH_EXPORT extern const char kAshDisableSoftwareMirroring[];
+#endif
 ASH_EXPORT extern const char kAshEnableAudioDeviceMenu[];
 ASH_EXPORT extern const char kAshEnableAdvancedGestures[];
 ASH_EXPORT extern const char kAshEnableBrightnessControl[];
-#if defined(OS_CHROMEOS)
-ASH_EXPORT extern const char kAshEnableSoftwareMirroring[];
-#endif
 #if defined(OS_LINUX)
 ASH_EXPORT extern const char kAshEnableMemoryMonitor[];
 #endif
diff --git a/ash/shell.cc b/ash/shell.cc
index 76b4638..1cc177f 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -439,7 +439,7 @@ void Shell::Init() {
     display_error_observer_.reset(new internal::DisplayErrorObserver());
     output_configurator_->AddObserver(display_error_observer_.get());
     output_configurator_->set_state_controller(display_change_observer_.get());
-    if (command_line->HasSwitch(ash::switches::kAshEnableSoftwareMirroring))
+    if (!command_line->HasSwitch(ash::switches::kAshDisableSoftwareMirroring))
       output_configurator_->set_mirroring_controller(display_manager_.get());
     output_configurator_->Start();
     display_change_observer_->OnDisplayModeChanged();