diff options
| author | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 20:34:34 +0000 |
|---|---|---|
| committer | davidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 20:34:34 +0000 |
| commit | 77f037650c26466d95ed6b138adff38873f0f7d9 (patch) | |
| tree | f4da81f0c1170bb573fe82ad0ff051bb11f16f21 /app/x11_util.h | |
| parent | da02f52b7a55681e02e36acbcf2f54528f8b496b (diff) | |
| download | chromium_src-77f037650c26466d95ed6b138adff38873f0f7d9.zip chromium_src-77f037650c26466d95ed6b138adff38873f0f7d9.tar.gz chromium_src-77f037650c26466d95ed6b138adff38873f0f7d9.tar.bz2 | |
Fix crash bug in new SSLClientSocketPool.
We also need to push additional error state out of the SSLClientSocketPool on a ERR_SSL_CLIENT_AUTH_CERT_NEEDED error.
BUG=49197
TEST=no crash when visiting https://foafssl.org/srv/idp?authreqissuer=http://foaf.me/index.php
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=52693
Review URL: http://codereview.chromium.org/2827053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/x11_util.h')
| -rw-r--r-- | app/x11_util.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/x11_util.h b/app/x11_util.h index b85061c..62881f0 100644 --- a/app/x11_util.h +++ b/app/x11_util.h @@ -66,6 +66,8 @@ int GetDefaultScreen(Display* display); // Get the X window id for the default root window XID GetX11RootWindow(); +// Returns the user's current desktop. +bool GetCurrentDesktop(int* desktop); // Get the X window id for the given GTK widget. XID GetX11WindowFromGtkWidget(GtkWidget* widget); XID GetX11WindowFromGdkWindow(GdkWindow* window); @@ -92,6 +94,11 @@ XID GetParentWindow(XID window); // Walk up |window|'s hierarchy until we find a direct child of |root|. XID GetHighestAncestorWindow(XID window, XID root); +static const int kAllDesktops = -1; +// Queries the desktop |window| is on, kAllDesktops if sticky. Returns false if +// property not found. +bool GetWindowDesktop(XID window, int* desktop); + // Implementers of this interface receive a notification for every X window of // the main display. class EnumerateWindowsDelegate { |