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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 615133002: Add support for a virtual display on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on ToT Created 5 years, 10 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/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index de4819495d8bea21bede92f59e485684b5cdb2c2..ac666f29395db075143670fcd65b728f3a2e7adc 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -211,10 +211,18 @@ void DisplayChangeObserver::OnDisplayModeChanged(
}
gfx::Rect display_bounds(state.display->origin(), mode_info->size());
- std::string name =
- state.display->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL ?
- l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
- state.display->display_name();
+ std::string name;
+ switch (state.display->type()) {
+ case ui::DISPLAY_CONNECTION_TYPE_INTERNAL:
+ name = l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME);
+ break;
+ case ui::DISPLAY_CONNECTION_TYPE_VIRTUAL:
+ name = l10n_util::GetStringUTF8(IDS_ASH_VIRTUAL_DISPLAY_NAME);
+ break;
+ default:
+ name = state.display->display_name();
+ }
+
if (name.empty())
name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);

Powered by Google App Engine
This is Rietveld 408576698