From dac70afef0bbd3661067adcb7746a56f5baf22b2 Mon Sep 17 00:00:00 2001 From: "robert.bradford" Date: Fri, 30 Oct 2015 08:42:15 -0700 Subject: ash: Remove --internal-display-color-profile-file This was useful for debugging and early integration efforts in ChromeOS and is no longer required. BUG=549558 TEST=On amd64-generic_freon observe that loading from named .icc file functions correctly. Review URL: https://codereview.chromium.org/1428963002 Cr-Commit-Position: refs/heads/master@{#357110} --- ash/display/display_color_manager_chromeos.cc | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'ash') diff --git a/ash/display/display_color_manager_chromeos.cc b/ash/display/display_color_manager_chromeos.cc index 060ee62..1ee0a51 100644 --- a/ash/display/display_color_manager_chromeos.cc +++ b/ash/display/display_color_manager_chromeos.cc @@ -18,7 +18,6 @@ #include "base/task_runner_util.h" #include "base/threading/sequenced_worker_pool.h" #include "chromeos/chromeos_paths.h" -#include "chromeos/chromeos_switches.h" #include "third_party/qcms/src/qcms.h" #include "ui/display/types/display_snapshot.h" #include "ui/display/types/gamma_ramp_rgb_entry.h" @@ -67,17 +66,6 @@ bool ParseFile(const base::FilePath& path, } base::FilePath PathForDisplaySnapshot(const ui::DisplaySnapshot* snapshot) { - if (gfx::Display::IsInternalDisplayId(snapshot->display_id())) { - const base::CommandLine* command_line = - base::CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch( - chromeos::switches::kInternalDisplayColorProfileFile)) { - const base::FilePath& path = command_line->GetSwitchValuePath( - chromeos::switches::kInternalDisplayColorProfileFile); - return base::FilePath(path); - } - } - base::FilePath path; CHECK( PathService::Get(chromeos::DIR_DEVICE_COLOR_CALIBRATION_PROFILES, &path)); -- cgit v1.1