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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 183893031: x11: Simplify some more event-rewrite code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 6 years, 9 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/window_tree_host_x11.cc ('k') | no next file » | 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/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1513 } else if (message_type == atom_cache_.GetAtom("XdndDrop")) { 1513 } else if (message_type == atom_cache_.GetAtom("XdndDrop")) {
1514 drag_drop_client_->OnXdndDrop(xev->xclient); 1514 drag_drop_client_->OnXdndDrop(xev->xclient);
1515 } 1515 }
1516 break; 1516 break;
1517 } 1517 }
1518 case MappingNotify: { 1518 case MappingNotify: {
1519 switch (xev->xmapping.request) { 1519 switch (xev->xmapping.request) {
1520 case MappingModifier: 1520 case MappingModifier:
1521 case MappingKeyboard: 1521 case MappingKeyboard:
1522 XRefreshKeyboardMapping(&xev->xmapping); 1522 XRefreshKeyboardMapping(&xev->xmapping);
1523 OnKeyboardMappingChanged();
1524 break; 1523 break;
1525 case MappingPointer: 1524 case MappingPointer:
1526 ui::DeviceDataManager::GetInstance()->UpdateButtonMap(); 1525 ui::DeviceDataManager::GetInstance()->UpdateButtonMap();
1527 break; 1526 break;
1528 default: 1527 default:
1529 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request; 1528 NOTIMPLEMENTED() << " Unknown request: " << xev->xmapping.request;
1530 break; 1529 break;
1531 } 1530 }
1532 break; 1531 break;
1533 } 1532 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 if (linux_ui) { 1627 if (linux_ui) {
1629 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1628 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1630 if (native_theme) 1629 if (native_theme)
1631 return native_theme; 1630 return native_theme;
1632 } 1631 }
1633 1632
1634 return ui::NativeTheme::instance(); 1633 return ui::NativeTheme::instance();
1635 } 1634 }
1636 1635
1637 } // namespace views 1636 } // namespace views
OLDNEW
« no previous file with comments | « ui/aura/window_tree_host_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698