| Index: content/child/npapi/webplugin_ime_win.cc
|
| ===================================================================
|
| --- content/child/npapi/webplugin_ime_win.cc (revision 0)
|
| +++ content/child/npapi/webplugin_ime_win.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/plugins/npapi/webplugin_ime_win.h"
|
| +#include "content/child/npapi/webplugin_ime_win.h"
|
|
|
| #include <cstring>
|
| #include <string>
|
| @@ -12,13 +12,13 @@
|
| #include "base/logging.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/synchronization/lock.h"
|
| -#include "webkit/plugins/npapi/plugin_constants_win.h"
|
| -#include "webkit/plugins/npapi/plugin_instance.h"
|
| +#include "content/child/npapi/plugin_instance.h"
|
| +#include "content/common/plugin_constants_win.h"
|
| +#include "webkit/plugins/npapi/plugin_utils.h"
|
|
|
| #pragma comment(lib, "imm32.lib")
|
|
|
| -namespace webkit {
|
| -namespace npapi {
|
| +namespace content {
|
|
|
| // A critical section that prevents two or more plug-ins from accessing a
|
| // WebPluginIMEWin instance through our patch function.
|
| @@ -273,7 +273,7 @@
|
| if (IsWindow(window)) {
|
| wchar_t name[128];
|
| GetClassName(window, &name[0], arraysize(name));
|
| - if (!wcscmp(&name[0], kNativeWindowClassName))
|
| + if (!wcscmp(&name[0], webkit::npapi::kNativeWindowClassName))
|
| return ::ImmGetContext(window);
|
| }
|
|
|
| @@ -321,5 +321,4 @@
|
| return TRUE;
|
| }
|
|
|
| -} // namespace npapi
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|