| Index: chrome/browser/chromeos/wm_ipc.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/wm_ipc.cc (revision 45523)
|
| +++ chrome/browser/chromeos/wm_ipc.cc (working copy)
|
| @@ -84,12 +84,18 @@
|
| type_to_atom_[ATOM_CHROME_WINDOW_TYPE], values);
|
| }
|
|
|
| -WmIpc::WindowType WmIpc::GetWindowType(GtkWidget* widget) {
|
| - int type;
|
| - if (x11_util::GetIntProperty(
|
| +WmIpc::WindowType WmIpc::GetWindowType(GtkWidget* widget,
|
| + std::vector<int>* params) {
|
| + std::vector<int> properties;
|
| + if (x11_util::GetIntArrayProperty(
|
| x11_util::GetX11WindowFromGtkWidget(widget),
|
| atom_to_string_[type_to_atom_[ATOM_CHROME_WINDOW_TYPE]],
|
| - &type)) {
|
| + &properties)) {
|
| + int type = properties.front();
|
| + if (params) {
|
| + params->clear();
|
| + params->insert(params->begin(), properties.begin() + 1, properties.end());
|
| + }
|
| return static_cast<WindowType>(type);
|
| } else {
|
| return WINDOW_TYPE_UNKNOWN;
|
|
|