summaryrefslogtreecommitdiffstats
path: root/ui/aura/root_window_host_linux.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 21:05:04 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 21:05:04 +0000
commitbe8857a9da76bd9428f78f62feffa92bc2918023 (patch)
treef48642693658270ff1214761f3ecd5f6b55c24e0 /ui/aura/root_window_host_linux.h
parentee847afb8a3c6cb9efba2c625a8a56083df81afb (diff)
downloadchromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.zip
chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.gz
chromium_src-be8857a9da76bd9428f78f62feffa92bc2918023.tar.bz2
Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay)
http://crbug.com/112131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9535025 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9564023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_linux.h')
-rw-r--r--ui/aura/root_window_host_linux.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/aura/root_window_host_linux.h b/ui/aura/root_window_host_linux.h
index 2ad9fe7..0d05b7b 100644
--- a/ui/aura/root_window_host_linux.h
+++ b/ui/aura/root_window_host_linux.h
@@ -17,7 +17,8 @@
namespace aura {
-class RootWindowHostLinux : public RootWindowHost {
+class RootWindowHostLinux : public RootWindowHost,
+ public MessageLoop::DestructionObserver {
public:
explicit RootWindowHostLinux(const gfx::Rect& bounds);
virtual ~RootWindowHostLinux();
@@ -44,6 +45,9 @@ class RootWindowHostLinux : public RootWindowHost {
virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
+ // MessageLoop::DestructionObserver Overrides.
+ virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+
// Returns true if there's an X window manager present... in most cases. Some
// window managers (notably, ion3) don't implement enough of ICCCM for us to
// detect that they're there.