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

Unified Diff: ash/monitor/multi_monitor_manager.cc

Issue 10255020: Get the default device scale factor from monitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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/monitor/multi_monitor_manager.cc
diff --git a/ash/monitor/multi_monitor_manager.cc b/ash/monitor/multi_monitor_manager.cc
index 874f22408018b9891e0c04315312e5c451b3781b..c9c2fb38bdd2ed15996b98c25e98e676ea483727 100644
--- a/ash/monitor/multi_monitor_manager.cc
+++ b/ash/monitor/multi_monitor_manager.cc
@@ -169,10 +169,12 @@ void MultiMonitorManager::Init() {
base::SplitString(size_str, ',', &parts);
for (vector<string>::const_iterator iter = parts.begin();
iter != parts.end(); ++iter) {
- monitors_.push_back(CreateMonitorFromSpec(*iter));
+ monitors_.push_back(CreateMonitorFromSpec(
+ default_device_scale_factor(), *iter));
}
if (monitors_.empty())
- monitors_.push_back(CreateMonitorFromSpec("" /* default */));
+ monitors_.push_back(CreateMonitorFromSpec(
+ default_device_scale_factor(), "" /* default */));
}
void MultiMonitorManager::AddRemoveMonitorImpl() {
@@ -185,7 +187,8 @@ void MultiMonitorManager::AddRemoveMonitorImpl() {
} else {
// Add if there is only one monitor.
new_monitors.push_back(monitors_[0]);
- new_monitors.push_back(CreateMonitorFromSpec("50+50-1280x768"));
+ new_monitors.push_back(CreateMonitorFromSpec(
+ default_device_scale_factor(), "50+50-1280x768"));
}
if (new_monitors.size())
OnNativeMonitorsChanged(new_monitors);
« no previous file with comments | « no previous file | ash/monitor/multi_monitor_manager_unittest.cc » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698