OLD | NEW |
---|---|
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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 case ui::VKEY_OEM_3: | 208 case ui::VKEY_OEM_3: |
209 case ui::VKEY_OEM_4: | 209 case ui::VKEY_OEM_4: |
210 case ui::VKEY_OEM_5: | 210 case ui::VKEY_OEM_5: |
211 case ui::VKEY_OEM_6: | 211 case ui::VKEY_OEM_6: |
212 case ui::VKEY_OEM_7: | 212 case ui::VKEY_OEM_7: |
213 case ui::VKEY_OEM_102: | 213 case ui::VKEY_OEM_102: |
214 case ui::VKEY_OEM_PLUS: | 214 case ui::VKEY_OEM_PLUS: |
215 case ui::VKEY_OEM_COMMA: | 215 case ui::VKEY_OEM_COMMA: |
216 case ui::VKEY_OEM_MINUS: | 216 case ui::VKEY_OEM_MINUS: |
217 case ui::VKEY_OEM_PERIOD: | 217 case ui::VKEY_OEM_PERIOD: |
218 case ui::VKEY_SPACE: | |
sadrul
2011/11/07 17:26:47
Move this up above VKEY_TAB.
Amruth Raj
2011/11/08 05:47:17
Done.
| |
218 return true; | 219 return true; |
219 default: | 220 default: |
220 return false; | 221 return false; |
221 } | 222 } |
222 } | 223 } |
223 | 224 |
224 class DesktopHostLinux : public DesktopHost { | 225 class DesktopHostLinux : public DesktopHost { |
225 public: | 226 public: |
226 explicit DesktopHostLinux(const gfx::Rect& bounds); | 227 explicit DesktopHostLinux(const gfx::Rect& bounds); |
227 virtual ~DesktopHostLinux(); | 228 virtual ~DesktopHostLinux(); |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
488 return new DesktopHostLinux(bounds); | 489 return new DesktopHostLinux(bounds); |
489 } | 490 } |
490 | 491 |
491 // static | 492 // static |
492 gfx::Size DesktopHost::GetNativeDisplaySize() { | 493 gfx::Size DesktopHost::GetNativeDisplaySize() { |
493 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); | 494 ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay(); |
494 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); | 495 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); |
495 } | 496 } |
496 | 497 |
497 } // namespace aura | 498 } // namespace aura |
OLD | NEW |