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

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

Issue 9958036: aura: Add RootWindowObserver::OnKeyboardMappingChanged(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/root_window_observer.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/root_window_host_linux.h" 5 #include "ui/aura/root_window_host_linux.h"
6 6
7 #include <X11/cursorfont.h> 7 #include <X11/cursorfont.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/extensions/Xfixes.h> 9 #include <X11/extensions/Xfixes.h>
10 #include <X11/extensions/Xrandr.h> 10 #include <X11/extensions/Xrandr.h>
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 if (!IsWindowManagerPresent() && focus_when_shown_) 460 if (!IsWindowManagerPresent() && focus_when_shown_)
461 XSetInputFocus(xdisplay_, xwindow_, RevertToNone, CurrentTime); 461 XSetInputFocus(xdisplay_, xwindow_, RevertToNone, CurrentTime);
462 handled = true; 462 handled = true;
463 break; 463 break;
464 } 464 }
465 case MappingNotify: { 465 case MappingNotify: {
466 switch (xev->xmapping.request) { 466 switch (xev->xmapping.request) {
467 case MappingModifier: 467 case MappingModifier:
468 case MappingKeyboard: 468 case MappingKeyboard:
469 XRefreshKeyboardMapping(&xev->xmapping); 469 XRefreshKeyboardMapping(&xev->xmapping);
470 root_window_->OnKeyboardMappingChanged();
470 break; 471 break;
471 case MappingPointer: 472 case MappingPointer:
472 ui::UpdateButtonMap(); 473 ui::UpdateButtonMap();
473 break; 474 break;
474 default: 475 default:
475 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request; 476 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request;
476 break; 477 break;
477 } 478 }
478 break; 479 break;
479 } 480 }
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 return new RootWindowHostLinux(bounds); 707 return new RootWindowHostLinux(bounds);
707 } 708 }
708 709
709 // static 710 // static
710 gfx::Size RootWindowHost::GetNativeScreenSize() { 711 gfx::Size RootWindowHost::GetNativeScreenSize() {
711 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); 712 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
712 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); 713 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
713 } 714 }
714 715
715 } // namespace aura 716 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/root_window_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698