diff options
| author | robert.bradford@intel.com <robert.bradford@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 19:59:34 +0000 |
|---|---|---|
| committer | robert.bradford@intel.com <robert.bradford@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-03 19:59:34 +0000 |
| commit | 772618e0f9cf18f90a12f3912d45b2cf129e3cec (patch) | |
| tree | 82d7dbe3861b0d2a99abac8d06d4fd6ad2ee861c /ash | |
| parent | 8b158e44a4c18974906b0b9fe7fb96989b115c2c (diff) | |
| download | chromium_src-772618e0f9cf18f90a12f3912d45b2cf129e3cec.zip chromium_src-772618e0f9cf18f90a12f3912d45b2cf129e3cec.tar.gz chromium_src-772618e0f9cf18f90a12f3912d45b2cf129e3cec.tar.bz2 | |
Include the display description in the picker on ChromeOS
The DesktopMediaListAsh uses the AuraWindow's title as the description
for the desktop source (window or screen.) To ensure that the display's
description appears we need to set the root window's title to the
display's name. This display name matches the name shown in the display
configuration UI.
BUG=372444
TEST=In a multiple display environment trigger the picker and observe
that the displays' names are included and match those in the display
settings UI.
Review URL: https://codereview.chromium.org/314733003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/display/display_controller.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index aebe47c..79a5f29 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -26,6 +26,7 @@ #include "ash/wm/coordinate_conversion.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/client/screen_position_client.h" @@ -724,6 +725,7 @@ AshWindowTreeHost* DisplayController::AddWindowTreeHostForDisplay( aura::WindowTreeHost* host = ash_host->AsWindowTreeHost(); host->window()->SetName(base::StringPrintf("RootWindow-%d", host_count++)); + host->window()->set_title(base::UTF8ToUTF16(display_info.name())); host->compositor()->SetBackgroundColor(SK_ColorBLACK); // No need to remove our observer observer because the DisplayController // outlives the host. |