diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 03:49:36 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 03:49:36 +0000 |
| commit | 23aff81843deaeaf36747a3718edf3de9bea0075 (patch) | |
| tree | 15d0a1af023a4268e71c87925bb4838c8d868e77 /ash | |
| parent | aac594ba87cc115fd1e332479e9cf0c8b1a6d02c (diff) | |
| download | chromium_src-23aff81843deaeaf36747a3718edf3de9bea0075.zip chromium_src-23aff81843deaeaf36747a3718edf3de9bea0075.tar.gz chromium_src-23aff81843deaeaf36747a3718edf3de9bea0075.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_switches.cc | 3 | ||||
| -rw-r--r-- | ash/ash_switches.h | 1 | ||||
| -rw-r--r-- | ash/shell.cc | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 5800bbc..ef47b00 100644 --- 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 index d502c82..e4c36b5 100644 --- 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 index c409294..ddb1598 100644 --- 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; |