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

Unified Diff: ash/display/display_change_observer_chromeos.cc

Issue 1456623002: Add support for virtual displays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address oshima@ feedback Created 5 years, 1 month 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 f167f9c10150fc27ee7ef8e96878f36294cd8580..3ff867035644902c29428f1d6f6aa418c52ce9ef 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -218,10 +218,18 @@ void DisplayChangeObserver::OnDisplayModeChanged(
}
gfx::Rect display_bounds(state->origin(), mode_info->size());
- std::string name =
- state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL
- ? l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME)
- : state->display_name();
+ std::string name;
+ switch (state->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_name();
+ }
+
if (name.empty())
name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
« no previous file with comments | « ash/ash_strings.grd ('k') | chrome/app/generated_resources.grd » ('j') | ui/display/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698