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

Side by Side Diff: ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup 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
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/controls/webview/unhandled_keyboard_event_handler.h" 5 #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/public/browser/native_web_keyboard_event.h" 8 #include "content/public/browser/native_web_keyboard_event.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/views/focus/focus_manager.h" 10 #include "ui/views/focus/focus_manager.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 return; 50 return;
51 } 51 }
52 52
53 // ProcessAccelerator didn't handle the accelerator, so we know both 53 // ProcessAccelerator didn't handle the accelerator, so we know both
54 // that |this| is still valid, and that we didn't want to set the flag. 54 // that |this| is still valid, and that we didn't want to set the flag.
55 ignore_next_char_event_ = false; 55 ignore_next_char_event_ = false;
56 } 56 }
57 57
58 // Any unhandled keyboard/character messages should be defproced. 58 // Any unhandled keyboard/character messages should be defproced.
59 // This allows stuff like F10, etc to work correctly. 59 // This allows stuff like F10, etc to work correctly.
60 #if defined(USE_AURA)
61 if (!event.os_event) 60 if (!event.os_event)
62 return; 61 return;
63 const MSG& message(event.os_event->native_event()); 62 const MSG& message(event.os_event->native_event());
64 #else
65 const MSG& message(event.os_event);
66 #endif
67 DefWindowProc(message.hwnd, message.message, message.wParam, message.lParam); 63 DefWindowProc(message.hwnd, message.message, message.wParam, message.lParam);
68 } 64 }
69 65
70 } // namespace views 66 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698