diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 02:29:15 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 02:29:15 +0000 |
| commit | 37be9eb6d97048f8f20bdad30e8756b7e03eeba5 (patch) | |
| tree | a0a517bf07bb5081b96c75e729bd2fa499fb82fd /chrome/browser/screensaver_window_finder_gtk.cc | |
| parent | 176279560e39373b5e5e6a9b95459f4aecd89165 (diff) | |
| download | chromium_src-37be9eb6d97048f8f20bdad30e8756b7e03eeba5.zip chromium_src-37be9eb6d97048f8f20bdad30e8756b7e03eeba5.tar.gz chromium_src-37be9eb6d97048f8f20bdad30e8756b7e03eeba5.tar.bz2 | |
Aura desktop: Fix tab dragging within a single chrome window.
Tabs can now be reordered inside a single chrome window on
linux_aura. Multiselection works too. Dragging out of a window doesn't
work yet.
Most of dock_info_aura.cc has been copied from dock_info_gtk.cc. A
helper function was moved from gtk_util to x11_util (which only used
pure X functions.)
BUG=133059
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10560014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/screensaver_window_finder_gtk.cc')
| -rw-r--r-- | chrome/browser/screensaver_window_finder_gtk.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/screensaver_window_finder_gtk.cc b/chrome/browser/screensaver_window_finder_gtk.cc index a94f323..4707514 100644 --- a/chrome/browser/screensaver_window_finder_gtk.cc +++ b/chrome/browser/screensaver_window_finder_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,6 @@ #include <gdk/gdkx.h> #include "base/basictypes.h" -#include "chrome/browser/ui/gtk/gtk_util.h" #include "ui/base/x/x11_util.h" @@ -19,7 +18,7 @@ ScreensaverWindowFinder::ScreensaverWindowFinder() bool ScreensaverWindowFinder::ScreensaverWindowExists() { gdk_error_trap_push(); ScreensaverWindowFinder finder; - gtk_util::EnumerateTopLevelWindows(&finder); + ui::EnumerateTopLevelWindows(&finder); bool got_error = gdk_error_trap_pop(); return finder.exists_ && !got_error; } |