summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 01:42:04 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-01 01:42:04 +0000
commite7f2be605361283b5ce2ea8d302ef9a8e34c4c69 (patch)
tree3c1a4e542f362ba4740ac9a69d7a317ef85f7550 /chrome/browser
parentfd736682404ee10f5f9fe2f5b40de3305e4260f7 (diff)
downloadchromium_src-e7f2be605361283b5ce2ea8d302ef9a8e34c4c69.zip
chromium_src-e7f2be605361283b5ce2ea8d302ef9a8e34c4c69.tar.gz
chromium_src-e7f2be605361283b5ce2ea8d302ef9a8e34c4c69.tar.bz2
Fix a bug where we were only checking the screen size of
the default monitor, not the current monitor when disabling the full screen hack in metacity/compiz. This is just a guess, I don't have a multimonitor setup here. BUG=32347 Review URL: http://codereview.chromium.org/557056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 8afa65e..f0982d4 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -262,7 +262,7 @@ GdkColor SkColorToGdkColor(const SkColor& color) {
// where setting the window size to the screen size causes the WM to set the
// EWMH for full screen mode.
void SetWindowSize(GtkWindow* window, int width, int height) {
- GdkScreen* screen = gdk_screen_get_default();
+ GdkScreen* screen = gtk_window_get_screen(window);
if (width == gdk_screen_get_width(screen) &&
height == gdk_screen_get_height(screen)) {
// Adjust the height so we don't trigger the WM feature.