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

Unified Diff: chromeos/display/output_configurator.cc

Issue 10675011: Rename the remaining usage of Monitor to Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 6 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
« no previous file with comments | « chromeos/display/output_configurator.h ('k') | chromeos/monitor/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/display/output_configurator.cc
diff --git a/chromeos/monitor/output_configurator.cc b/chromeos/display/output_configurator.cc
similarity index 99%
rename from chromeos/monitor/output_configurator.cc
rename to chromeos/display/output_configurator.cc
index 8e47f07fe80ac4f8db177c465c6e41c96cc47143..4543a5286384baea73c794ac07b5ed3aa36c1131 100644
--- a/chromeos/monitor/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chromeos/monitor/output_configurator.h"
+#include "chromeos/display/output_configurator.h"
#include <X11/Xlib.h>
#include <X11/extensions/dpms.h>
@@ -37,15 +37,15 @@ const float kPixelsToMmScale = kMmInInch / kDpi96;
// The DPI threshold to detech high density screen.
// Higher DPI than this will use device_scale_factor=2
-// Should be kept in sync with monitor_change_observer_x11.cc
+// Should be kept in sync with display_change_observer_x11.cc
const unsigned int kHighDensityDIPThreshold = 160;
// Prefixes for the built-in displays.
const char kInternal_LVDS[] = "LVDS";
const char kInternal_eDP[] = "eDP";
-// Gap between screens so cursor at bottom of active monitor doesn't partially
-// appear on top of inactive monitor. Higher numbers guard against larger
+// Gap between screens so cursor at bottom of active display doesn't partially
+// appear on top of inactive display. Higher numbers guard against larger
// cursors, but also waste more memory. We will double this gap for screens
// with a device_scale_factor of 2. While this gap will not guard against all
// possible cursors in X, it should handle the ones we actually use. See
« no previous file with comments | « chromeos/display/output_configurator.h ('k') | chromeos/monitor/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698