Index: webkit/plugins/ppapi/ppb_char_set_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppb_char_set_impl.cc (revision 0) |
+++ webkit/plugins/ppapi/ppb_char_set_impl.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/glue/plugins/pepper_char_set.h" |
+#include "webkit/plugins/ppapi/ppb_char_set_impl.h" |
#include <stdlib.h> |
@@ -12,12 +12,13 @@ |
#include "unicode/ucnv_cb.h" |
#include "unicode/ucnv_err.h" |
#include "unicode/ustring.h" |
-#include "webkit/glue/plugins/pepper_plugin_delegate.h" |
-#include "webkit/glue/plugins/pepper_plugin_instance.h" |
-#include "webkit/glue/plugins/pepper_plugin_module.h" |
-#include "webkit/glue/plugins/pepper_var.h" |
+#include "webkit/plugins/ppapi/plugin_delegate.h" |
+#include "webkit/plugins/ppapi/plugin_instance.h" |
+#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/var.h" |
-namespace pepper { |
+namespace webkit { |
+namespace ppapi { |
namespace { |
@@ -44,7 +45,7 @@ |
// The "substitution" behavior of this function does not match the |
// implementation in base, so we partially duplicate the code from |
// icu_string_conversions.cc with the correct error handling setup required |
-// by this pepper interface. |
+// by this PPAPI interface. |
char* UTF16ToCharSet(const uint16_t* utf16, uint32_t utf16_len, |
const char* output_char_set, |
PP_CharSet_ConversionError on_error, |
@@ -159,8 +160,10 @@ |
} // namespace |
// static |
-const struct PPB_CharSet_Dev* CharSet::GetInterface() { |
+const struct PPB_CharSet_Dev* PPB_CharSet_Impl::GetInterface() { |
return &ppb_charset; |
} |
-} // namespace pepper |
+} // namespace ppapi |
+} // namespace webkit |
+ |