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

Unified Diff: content/renderer/npapi/webplugin_delegate_proxy.h

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/npapi/webplugin_delegate_proxy.h
diff --git a/content/renderer/npapi/webplugin_delegate_proxy.h b/content/renderer/npapi/webplugin_delegate_proxy.h
index 679bc6d976d2801764254f5caf5d99ad2497595b..04c46845d0a99e9c3959b04f8311ca12a886760c 100644
--- a/content/renderer/npapi/webplugin_delegate_proxy.h
+++ b/content/renderer/npapi/webplugin_delegate_proxy.h
@@ -64,7 +64,7 @@ class WebPluginDelegateProxy
virtual void Paint(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
virtual NPObject* GetPluginScriptableObject() OVERRIDE;
virtual struct _NPP* GetPluginNPP() OVERRIDE;
- virtual bool GetFormValue(string16* value) OVERRIDE;
+ virtual bool GetFormValue(base::string16* value) OVERRIDE;
virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
int notify_id) OVERRIDE;
virtual void SetFocus(bool focused) OVERRIDE;
@@ -78,14 +78,15 @@ class WebPluginDelegateProxy
#if defined(OS_WIN)
// Informs the plugin that plugin IME has updated its status.
virtual void ImeCompositionUpdated(
- const string16& text,
+ const base::string16& text,
const std::vector<int>& clauses,
const std::vector<int>& target,
int cursor_position,
int plugin_id);
// Informs the plugin that plugin IME has completed.
// If |text| is empty, composition was cancelled.
- virtual void ImeCompositionCompleted(const string16& text, int plugin_id);
+ virtual void ImeCompositionCompleted(const base::string16& text,
+ int plugin_id);
#endif
#if defined(OS_MACOSX)
// Informs the plugin that its enclosing window has gained or lost focus.
@@ -96,7 +97,8 @@ class WebPluginDelegateProxy
virtual void WindowFrameChanged(gfx::Rect window_frame, gfx::Rect view_frame);
// Informs the plugin that plugin IME has completed.
// If |text| is empty, composition was cancelled.
- virtual void ImeCompositionCompleted(const string16& text, int plugin_id);
+ virtual void ImeCompositionCompleted(const base::string16& text,
+ int plugin_id);
#endif
// IPC::Listener implementation:
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.cc ('k') | content/renderer/npapi/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698