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

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

Issue 15995038: Use a direct include of utf_string_conversions.h in google_apis/, gpu/, ipc/, media/, ppapi/, print… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: better Created 7 years, 6 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 "webkit/plugins/npapi/webplugin_ime_win.h" 5 #include "webkit/plugins/npapi/webplugin_ime_win.h"
6 6
7 #include <cstring> 7 #include <cstring>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/utf_string_conversions.h"
13 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
14 #include "base/utf_string_conversions.h"
15 #include "webkit/plugins/npapi/plugin_constants_win.h" 15 #include "webkit/plugins/npapi/plugin_constants_win.h"
16 #include "webkit/plugins/npapi/plugin_instance.h" 16 #include "webkit/plugins/npapi/plugin_instance.h"
17 17
18 #pragma comment(lib, "imm32.lib") 18 #pragma comment(lib, "imm32.lib")
19 19
20 namespace webkit { 20 namespace webkit {
21 namespace npapi { 21 namespace npapi {
22 22
23 // A critical section that prevents two or more plug-ins from accessing a 23 // A critical section that prevents two or more plug-ins from accessing a
24 // WebPluginIMEWin instance through our patch function. 24 // WebPluginIMEWin instance through our patch function.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 if (instance->input_type_ != input_type) { 316 if (instance->input_type_ != input_type) {
317 instance->input_type_ = input_type; 317 instance->input_type_ = input_type;
318 instance->status_updated_ = true; 318 instance->status_updated_ = true;
319 } 319 }
320 320
321 return TRUE; 321 return TRUE;
322 } 322 }
323 323
324 } // namespace npapi 324 } // namespace npapi
325 } // namespace webkit 325 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/webplugin_delegate_impl_mac.mm ('k') | webkit/plugins/npapi/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698