ash/shell.cc - Issue 1118373006: Revert of Load and apply a vcgt table from an ICC file to the internal display

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shell.cc

Issue 1118373006: Revert of 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: Created 5 years, 7 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 a6f455b15dc98a78d4fb392777c73e012fb568de..e572d8de68d9d4104d7566cb741a5a1a647f8751 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -121,7 +121,6 @@

#include "ash/accelerators/magnifier_key_scroller.h"

#include "ash/accelerators/spoken_feedback_toggler.h"

#include "ash/ash_constants.h"

-#include "ash/content/display/display_color_manager_chromeos.h"

#include "ash/content/display/screen_orientation_controller_chromeos.h"

#include "ash/display/display_change_observer_chromeos.h"

#include "ash/display/display_configurator_animation.h"

@@ -812,7 +811,6 @@

keyboard::KeyboardController::ResetInstance(NULL);

#if defined(OS_CHROMEOS)

- display_color_manager_.reset();

if (display_change_observer_)

display_configurator_->RemoveObserver(display_change_observer_.get());

if (display_configurator_animation_)

@@ -865,8 +863,6 @@

delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);

display_initialized = true;

}

- display_color_manager_.reset(

- new DisplayColorManager(display_configurator_.get()));

#endif // defined(OS_CHROMEOS)

if (!display_initialized)

display_manager_->InitDefaultDisplay();

« no previous file with comments | « ash/shell.h ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »