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

Side by Side Diff: webkit/plugins/npapi/webplugin_ime_win.cc

Issue 9117038: Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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 | « webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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) 2011 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 "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 "webkit/plugins/npapi/plugin_constants_win.h" 14 #include "webkit/plugins/npapi/plugin_constants_win.h"
15 #include "webkit/plugins/npapi/plugin_instance.h" 15 #include "webkit/plugins/npapi/plugin_instance.h"
16 16
17 #pragma comment(lib, "imm32.lib") 17 #pragma comment(lib, "imm32.lib")
18 18
19 namespace webkit { 19 namespace webkit {
20 namespace npapi { 20 namespace npapi {
21 21
22 // 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
23 // WebPluginIMEWin instance through our patch function. 23 // WebPluginIMEWin instance through our patch function.
24 base::LazyInstance<base::Lock, 24 base::LazyInstance<base::Lock>::Leaky
25 base::LeakyLazyInstanceTraits<base::Lock> >
26 g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER; 25 g_webplugin_ime_lock = LAZY_INSTANCE_INITIALIZER;
27 26
28 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL; 27 WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL;
29 28
30 WebPluginIMEWin::WebPluginIMEWin() 29 WebPluginIMEWin::WebPluginIMEWin()
31 : cursor_position_(0), 30 : cursor_position_(0),
32 delta_start_(0), 31 delta_start_(0),
33 composing_text_(false), 32 composing_text_(false),
34 support_ime_messages_(false), 33 support_ime_messages_(false),
35 status_updated_(false), 34 status_updated_(false),
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 if (instance->input_type_ != input_type) { 311 if (instance->input_type_ != input_type) {
313 instance->input_type_ = input_type; 312 instance->input_type_ = input_type;
314 instance->status_updated_ = true; 313 instance->status_updated_ = true;
315 } 314 }
316 315
317 return TRUE; 316 return TRUE;
318 } 317 }
319 318
320 } // namespace npapi 319 } // namespace npapi
321 } // namespace webkit 320 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698