Remove obsolete --ash-disable-software-mirroring option

BUG=none Review URL: https://codereview.chromium.org/41313002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230933 0039d316-1c4b-4281-b951-d872f2087c98
qweri0p · Oct 25, 2013 · 23aff81 · 23aff81
1 parent aac594b
commit 23aff81
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
@@ -62,9 +62,6 @@ const char kAshDisableDisplayChangeLimiter[] =
     "ash-disable-display-change-limiter";
 
 #if defined(OS_CHROMEOS)
-// Disable compositor based mirroring.
-const char kAshDisableSoftwareMirroring[] = "ash-disable-software-mirroring";
-
 // Disable the notification when a low-power USB charger is connected.
 const char kAshDisableUsbChargerNotification[] =
     "ash-disable-usb-charger-notification";

diff --git a/ash/ash_switches.h b/ash/ash_switches.h
@@ -35,7 +35,6 @@ ASH_EXPORT extern const char kAshDisableDragOffShelf[];
 ASH_EXPORT extern const char kAshDisableOverviewMode[];
 ASH_EXPORT extern const char kAshDisableDragAndDropAppListToLauncher[];
 #if defined(OS_CHROMEOS)
-ASH_EXPORT extern const char kAshDisableSoftwareMirroring[];
 ASH_EXPORT extern const char kAshDisableUsbChargerNotification[];
 ASH_EXPORT extern const char kAshEnableAudioDeviceMenu[];
 #endif

diff --git a/ash/shell.cc b/ash/shell.cc
@@ -703,8 +703,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::kAshDisableSoftwareMirroring))
-      output_configurator_->set_mirroring_controller(display_manager_.get());
+    output_configurator_->set_mirroring_controller(display_manager_.get());
     output_configurator_->Start(
         delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
     display_initialized = true;