diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 06:34:32 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 06:34:32 +0000 |
| commit | 04140a810d17fb3baef923f73c72bccc9d8f5fb6 (patch) | |
| tree | 2a9f711e3fd72921eb71c0bd2282ce8839b82198 /ash | |
| parent | a9dc5ec4ed16fb3e02d2c9742d32a5342e390838 (diff) | |
| download | chromium_src-04140a810d17fb3baef923f73c72bccc9d8f5fb6.zip chromium_src-04140a810d17fb3baef923f73c72bccc9d8f5fb6.tar.gz chromium_src-04140a810d17fb3baef923f73c72bccc9d8f5fb6.tar.bz2 | |
Unittests of color profiles change.
BUG=355776
R=oshima@chromium.org
TEST=unit_tests
Review URL: https://codereview.chromium.org/217543006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_manager.cc | 4 | ||||
| -rw-r--r-- | ash/test/display_manager_test_api.cc | 7 | ||||
| -rw-r--r-- | ash/test/display_manager_test_api.h | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc index fb4bd6e..fb4fec7 100644 --- a/ash/display/display_manager.cc +++ b/ash/display/display_manager.cc @@ -514,7 +514,9 @@ void DisplayManager::SetColorCalibrationProfile( if (delegate_) delegate_->PreDisplayConfigurationChange(false); - if (Shell::GetInstance()->output_configurator()->SetColorCalibrationProfile( + // Just sets color profile if it's not running on ChromeOS (like tests). + if (!base::SysInfo::IsRunningOnChromeOS() || + Shell::GetInstance()->output_configurator()->SetColorCalibrationProfile( display_id, profile)) { display_info_[display_id].SetColorProfile(profile); UMA_HISTOGRAM_ENUMERATION( diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc index 764f8a1..794916b 100644 --- a/ash/test/display_manager_test_api.cc +++ b/ash/test/display_manager_test_api.cc @@ -92,5 +92,12 @@ void DisplayManagerTestApi::DisableChangeDisplayUponHostResize() { display_manager_->set_change_display_upon_host_resize(false); } +void DisplayManagerTestApi::SetAvailableColorProfiles( + int64 display_id, + const std::vector<ui::ColorCalibrationProfile>& profiles) { + display_manager_->display_info_[display_id].set_available_color_profiles( + profiles); +} + } // namespace test } // namespace ash diff --git a/ash/test/display_manager_test_api.h b/ash/test/display_manager_test_api.h index 70dbd2e..db47ab3 100644 --- a/ash/test/display_manager_test_api.h +++ b/ash/test/display_manager_test_api.h @@ -6,8 +6,10 @@ #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ #include <string> +#include <vector> #include "base/basictypes.h" +#include "ui/display/display_constants.h" namespace ash { namespace internal { @@ -34,6 +36,11 @@ class DisplayManagerTestApi { // Don't update the display when the root window's size was changed. void DisableChangeDisplayUponHostResize(); + // Sets the available color profiles for |display_id|. + void SetAvailableColorProfiles( + int64 display_id, + const std::vector<ui::ColorCalibrationProfile>& profiles); + private: internal::DisplayManager* display_manager_; // not owned |