summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_window_gtk.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/gtk/browser_window_gtk.cc')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc9
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