diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:13:08 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:13:08 +0000 |
| commit | b5930829068618a12e95ffb5de7d27a87766e687 (patch) | |
| tree | bc4624119176e23d6db25ce42e85b77c5ea24384 /chrome/browser/gtk | |
| parent | 859bd64faf943ceb7f3ed0f16e5c4a3ca55edf2b (diff) | |
| download | chromium_src-b5930829068618a12e95ffb5de7d27a87766e687.zip chromium_src-b5930829068618a12e95ffb5de7d27a87766e687.tar.gz chromium_src-b5930829068618a12e95ffb5de7d27a87766e687.tar.bz2 | |
Linux: Fix cast breakage from 22193 (hopefully).
Review URL: http://codereview.chromium.org/159737
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index aef73ad..e4f7155 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -1738,16 +1738,19 @@ bool BrowserWindowGtk::GetWindowEdge(int x, int y, GdkWindowEdge* edge) { // static bool BrowserWindowGtk::GetCustomFramePrefDefault() { - XID wm_window; + int wm_window = 0; if (!x11_util::GetIntProperty(x11_util::GetX11RootWindow(), "_NET_SUPPORTING_WM_CHECK", - reinterpret_cast<int*>(&wm_window))) { + &wm_window)) { return false; } std::string wm_name; - if (!x11_util::GetStringProperty(wm_window, "_NET_WM_NAME", &wm_name)) + if (!x11_util::GetStringProperty(static_cast<XID>(wm_window), + "_NET_WM_NAME", + &wm_name)) { return false; + } // Ideally, we'd use the custom frame by default and just fall back on using // system decorations for the few (?) tiling window managers where it doesn't |