Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2503)

Unified Diff: ash/shell.cc

Issue 1028563003: Load and apply a vcgt table from an ICC file to the internal display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ash::DisplayColorManager Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index ee93a3421deaaf6943c754ee4addbe33574dd964..d946e9e6a7a380b8f05742f6afaf24c8a8756163 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -123,6 +123,7 @@
#include "ash/ash_constants.h"
#include "ash/content/display/screen_orientation_controller_chromeos.h"
#include "ash/display/display_change_observer_chromeos.h"
+#include "ash/display/display_color_manager_chromeos.h"
#include "ash/display/display_configurator_animation.h"
#include "ash/display/display_error_observer_chromeos.h"
#include "ash/display/projecting_observer_chromeos.h"
@@ -810,6 +811,7 @@ Shell::~Shell() {
keyboard::KeyboardController::ResetInstance(NULL);
#if defined(OS_CHROMEOS)
+ display_color_manager_ = nullptr;
if (display_change_observer_)
display_configurator_->RemoveObserver(display_change_observer_.get());
if (display_configurator_animation_)
@@ -859,6 +861,7 @@ void Shell::Init(const ShellInitParams& init_params) {
delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
display_initialized = true;
}
+ display_color_manager_ = new DisplayColorManager(display_configurator_.get());
#endif // defined(OS_CHROMEOS)
if (!display_initialized)
display_manager_->InitDefaultDisplay();

Powered by Google App Engine
This is Rietveld 408576698