Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: ui/aura/root_window_host_linux.cc

Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/root_window_host_linux.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_host_linux.cc
===================================================================
--- ui/aura/root_window_host_linux.cc (revision 124527)
+++ ui/aura/root_window_host_linux.cc (working copy)
@@ -305,8 +305,6 @@
if (base::MessagePumpForUI::HasXInput2())
ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
- MessageLoopForUI::current()->AddDestructionObserver(this);
-
// Initialize invisible cursor.
char nodata[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
XColor black;
@@ -328,8 +326,6 @@
ui::GetXCursor(ui::kCursorClearXCursorCache);
XFreeCursor(xdisplay_, invisible_cursor_);
-
- MessageLoopForUI::current()->RemoveDestructionObserver(this);
}
base::MessagePumpDispatcher::DispatchStatus RootWindowHostLinux::Dispatch(
@@ -624,10 +620,6 @@
XSendEvent(xdisplay_, xwindow_, False, 0, &xevent);
}
-void RootWindowHostLinux::WillDestroyCurrentMessageLoop() {
- aura::RootWindow::DeleteInstance();
-}
-
bool RootWindowHostLinux::IsWindowManagerPresent() {
// Per ICCCM 2.8, "Manager Selections", window managers should take ownership
// of WM_Sn selections (where n is a screen number).
« no previous file with comments | « ui/aura/root_window_host_linux.h ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698