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 "webkit/plugins/npapi/webplugin_ime_win.h" | 5 #include "webkit/plugins/npapi/webplugin_ime_win.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/synchronization/lock.h" | 12 #include "base/synchronization/lock.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | |
15 #include "webkit/plugins/npapi/plugin_constants_win.h" | 14 #include "webkit/plugins/npapi/plugin_constants_win.h" |
16 #include "webkit/plugins/npapi/plugin_instance.h" | 15 #include "webkit/plugins/npapi/plugin_instance.h" |
17 | 16 |
18 #pragma comment(lib, "imm32.lib") | 17 #pragma comment(lib, "imm32.lib") |
19 | 18 |
20 using WebKit::WebInputEvent; | |
21 using WebKit::WebCompositionEvent; | |
22 | |
23 namespace webkit { | 19 namespace webkit { |
24 namespace npapi { | 20 namespace npapi { |
25 | 21 |
26 // A critical section that prevents two or more plug-ins from accessing a | 22 // A critical section that prevents two or more plug-ins from accessing a |
27 // WebPluginIMEWin instance through our patch function. | 23 // WebPluginIMEWin instance through our patch function. |
28 base::LazyInstance<base::Lock, | 24 base::LazyInstance<base::Lock, |
29 base::LeakyLazyInstanceTraits<base::Lock> > | 25 base::LeakyLazyInstanceTraits<base::Lock> > |
30 g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER; | 26 g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER; |
31 | 27 |
32 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL; | 28 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL; |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 if (instance->input_type_ != input_type) { | 312 if (instance->input_type_ != input_type) { |
317 instance->input_type_ = input_type; | 313 instance->input_type_ = input_type; |
318 instance->status_updated_ = true; | 314 instance->status_updated_ = true; |
319 } | 315 } |
320 | 316 |
321 return TRUE; | 317 return TRUE; |
322 } | 318 } |
323 | 319 |
324 } // namespace npapi | 320 } // namespace npapi |
325 } // namespace webkit | 321 } // namespace webkit |
OLD | NEW |