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

Side by Side Diff: ui/aura/desktop_host_linux.cc

Issue 8387043: [Aura] Support always-on-top top level window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and update comment per ben Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/client/aura_constants.cc ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/desktop_host.h" 5 #include "ui/aura/desktop_host.h"
6 6
7 #include <X11/cursorfont.h> 7 #include <X11/cursorfont.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class. 10 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 // TODO(sadrul): reenable once 103981 is fixed. 283 // TODO(sadrul): reenable once 103981 is fixed.
284 #if defined(TOUCH_UI) 284 #if defined(TOUCH_UI)
285 if (base::MessagePumpForUI::HasXInput2()) 285 if (base::MessagePumpForUI::HasXInput2())
286 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_); 286 ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
287 #endif 287 #endif
288 } 288 }
289 289
290 DesktopHostLinux::~DesktopHostLinux() { 290 DesktopHostLinux::~DesktopHostLinux() {
291 XDestroyWindow(xdisplay_, xwindow_); 291 XDestroyWindow(xdisplay_, xwindow_);
292
293 // Clears XCursorCache.
294 ui::GetXCursor(ui::kCursorClearXCursorCache);
292 } 295 }
293 296
294 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch( 297 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch(
295 XEvent* xev) { 298 XEvent* xev) {
296 bool handled = false; 299 bool handled = false;
297 switch (xev->type) { 300 switch (xev->type) {
298 case Expose: 301 case Expose:
299 desktop_->Draw(); 302 desktop_->Draw();
300 handled = true; 303 handled = true;
301 break; 304 break;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 return new DesktopHostLinux(bounds); 495 return new DesktopHostLinux(bounds);
493 } 496 }
494 497
495 // static 498 // static
496 gfx::Size DesktopHost::GetNativeDisplaySize() { 499 gfx::Size DesktopHost::GetNativeDisplaySize() {
497 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); 500 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
498 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); 501 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
499 } 502 }
500 503
501 } // namespace aura 504 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/aura_constants.cc ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698