diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 19:50:44 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 19:50:44 +0000 |
| commit | bf3f459e77614c248b31b30f47a0376da73972df (patch) | |
| tree | 752892ef394528e829b76dc00b49d4074b228814 /ui/display/chromeos | |
| parent | 4041b033b8f6fb59a614562aa669b5b0ea4fde5e (diff) | |
| download | chromium_src-bf3f459e77614c248b31b30f47a0376da73972df.zip chromium_src-bf3f459e77614c248b31b30f47a0376da73972df.tar.gz chromium_src-bf3f459e77614c248b31b30f47a0376da73972df.tar.bz2 | |
Introduces --disable-display-color-calibration flag.
The feature is not mature yet, so it's safer to add the flag to
disable the feature itself.
BUG=356786
R=oshima@chromium.org
TEST=none
Review URL: https://codereview.chromium.org/216273004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/display/chromeos')
| -rw-r--r-- | ui/display/chromeos/output_configurator.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/display/chromeos/output_configurator.cc b/ui/display/chromeos/output_configurator.cc index 9523afe..a60c46c 100644 --- a/ui/display/chromeos/output_configurator.cc +++ b/ui/display/chromeos/output_configurator.cc @@ -5,6 +5,7 @@ #include "ui/display/chromeos/output_configurator.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -13,6 +14,7 @@ #include "ui/display/chromeos/display_mode.h" #include "ui/display/chromeos/display_snapshot.h" #include "ui/display/chromeos/native_display_delegate.h" +#include "ui/display/display_switches.h" #if defined(USE_OZONE) #include "ui/display/chromeos/ozone/native_display_delegate_ozone.h" @@ -402,11 +404,14 @@ bool OutputConfigurator::EnableOutputProtection( std::vector<ui::ColorCalibrationProfile> OutputConfigurator::GetAvailableColorCalibrationProfiles( int64_t display_id) { - for (size_t i = 0; i < cached_outputs_.size(); ++i) { - if (cached_outputs_[i].display && - cached_outputs_[i].display->display_id() == display_id) { - return native_display_delegate_->GetAvailableColorCalibrationProfiles( - *cached_outputs_[i].display); + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableDisplayColorCalibration)) { + for (size_t i = 0; i < cached_outputs_.size(); ++i) { + if (cached_outputs_[i].display && + cached_outputs_[i].display->display_id() == display_id) { + return native_display_delegate_->GetAvailableColorCalibrationProfiles( + *cached_outputs_[i].display); + } } } |