summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/wm_ipc.cc
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 17:26:49 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 17:26:49 +0000
commitd65adb173f09a837c96f96fc24a258f439e46e58 (patch)
tree43605ab367e97389930c518c4e94bd3da5f20080 /chrome/browser/chromeos/wm_ipc.cc
parent7cea56d943924d0c2196bdf4049f592b6182992c (diff)
downloadchromium_src-d65adb173f09a837c96f96fc24a258f439e46e58.zip
chromium_src-d65adb173f09a837c96f96fc24a258f439e46e58.tar.gz
chromium_src-d65adb173f09a837c96f96fc24a258f439e46e58.tar.bz2
This adds in the ability for Chrome to generate windows with snapshots
of all currently open tabs in all browsers. This is needed for overview mode on ChromeOS. BUG=http://code.google.com/p/chromium-os/issues/detail?id=1170 TEST=Ran Chrome under ChromeOS with updated window manager. Review URL: http://codereview.chromium.org/661237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/wm_ipc.cc')
-rw-r--r--chrome/browser/chromeos/wm_ipc.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/wm_ipc.cc b/chrome/browser/chromeos/wm_ipc.cc
index da1ed06..f3e298b 100644
--- a/chrome/browser/chromeos/wm_ipc.cc
+++ b/chrome/browser/chromeos/wm_ipc.cc
@@ -84,12 +84,18 @@ bool WmIpc::SetWindowType(GtkWidget* widget,
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;