summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorrobert.bradford <robert.bradford@intel.com>2015-10-30 08:42:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-30 15:43:09 +0000
commitdac70afef0bbd3661067adcb7746a56f5baf22b2 (patch)
tree4762e7cfb1689b731d7fce39064b19f0d274d7d6 /ash
parent826bb4293eb8e01c5fa6c7fe6d4a44de6e5b5a53 (diff)
downloadchromium_src-dac70afef0bbd3661067adcb7746a56f5baf22b2.zip
chromium_src-dac70afef0bbd3661067adcb7746a56f5baf22b2.tar.gz
chromium_src-dac70afef0bbd3661067adcb7746a56f5baf22b2.tar.bz2
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}
Diffstat (limited to 'ash')
-rw-r--r--ash/display/display_color_manager_chromeos.cc12
1 files changed, 0 insertions, 12 deletions
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));