diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 18:54:57 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 18:54:57 +0000 |
| commit | e13e2b7514ba4be99aaf6ae415f03cf4dcb9cb2d (patch) | |
| tree | 4fb1c4ef7dffc7a9314f83339287c62e71cdff18 /ui/base/x | |
| parent | 4b067bc551ff698e2d1429a9b1d04b0b5704fced (diff) | |
| download | chromium_src-e13e2b7514ba4be99aaf6ae415f03cf4dcb9cb2d.zip chromium_src-e13e2b7514ba4be99aaf6ae415f03cf4dcb9cb2d.tar.gz chromium_src-e13e2b7514ba4be99aaf6ae415f03cf4dcb9cb2d.tar.bz2 | |
Revert 156070 - Add a new tray item for the current multi display configuration.
Tested on lumpy.
BUG=141394
Review URL: https://chromiumcodereview.appspot.com/10905097
TBR=mukai@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/x')
| -rw-r--r-- | ui/base/x/x11_util.cc | 14 | ||||
| -rw-r--r-- | ui/base/x/x11_util.h | 7 |
2 files changed, 3 insertions, 18 deletions
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index dc738b5..efe05af 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -1167,23 +1167,13 @@ bool GetOutputDeviceData(XID output, return true; } -std::vector<std::string> GetDisplayNames(const std::vector<XID>& output_ids) { - std::vector<std::string> names; - for (size_t i = 0; i < output_ids.size(); ++i) { - std::string display_name; - if (GetOutputDeviceData(output_ids[i], NULL, NULL, &display_name)) - names.push_back(display_name); - } - return names; -} - -std::vector<std::string> GetOutputNames(const std::vector<XID>& output_ids) { +std::vector<std::string> GetOutputNames(std::vector<XID> output_ids) { std::vector<std::string> names; Display* display = GetXDisplay(); Window root_window = DefaultRootWindow(display); XRRScreenResources* screen_resources = XRRGetScreenResources(display, root_window); - for (std::vector<XID>::const_iterator iter = output_ids.begin(); + for (std::vector<XID>::iterator iter = output_ids.begin(); iter != output_ids.end(); ++iter) { XRROutputInfo* output = XRRGetOutputInfo(display, screen_resources, *iter); diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h index 66574b3..869ef7c 100644 --- a/ui/base/x/x11_util.h +++ b/ui/base/x/x11_util.h @@ -256,13 +256,8 @@ UI_EXPORT bool GetOutputDeviceData(XID output, uint32* serial_number, std::string* human_readable_name); -// Gets the names of the all displays physically connected to the system. -UI_EXPORT std::vector<std::string> GetDisplayNames( - const std::vector<XID>& output_id); - // Gets the name of outputs given by |output_id|. -UI_EXPORT std::vector<std::string> GetOutputNames( - const std::vector<XID>& output_id); +UI_EXPORT std::vector<std::string> GetOutputNames(std::vector<XID> output_id); enum WindowManagerName { WM_UNKNOWN, |