diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 20:43:31 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 20:43:31 +0000 |
| commit | ca77581c3138913ae4816043d591d1dc4e01eaad (patch) | |
| tree | 5793efde9b235b339fdd99189270f1143cf1c7b7 /components/plugins | |
| parent | 464cddaa575a10f5733bfebec77fb6b569dcdd17 (diff) | |
| download | chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.zip chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.tar.gz chromium_src-ca77581c3138913ae4816043d591d1dc4e01eaad.tar.bz2 | |
Use base namespace for string16 in components and cloud_print.
R=scottbyer@chromium.org
TBR=scottbyer
Review URL: https://codereview.chromium.org/107383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/plugins')
| -rw-r--r-- | components/plugins/renderer/plugin_placeholder.cc | 2 | ||||
| -rw-r--r-- | components/plugins/renderer/plugin_placeholder.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/plugins/renderer/plugin_placeholder.cc b/components/plugins/renderer/plugin_placeholder.cc index b4b725b..b8f050f 100644 --- a/components/plugins/renderer/plugin_placeholder.cc +++ b/components/plugins/renderer/plugin_placeholder.cc @@ -157,7 +157,7 @@ void PluginPlaceholder::HidePlugin() { void PluginPlaceholder::WillDestroyPlugin() { delete this; } -void PluginPlaceholder::SetMessage(const string16& message) { +void PluginPlaceholder::SetMessage(const base::string16& message) { message_ = message; if (finished_loading_) UpdateMessage(); diff --git a/components/plugins/renderer/plugin_placeholder.h b/components/plugins/renderer/plugin_placeholder.h index 19d8c14..f317537 100644 --- a/components/plugins/renderer/plugin_placeholder.h +++ b/components/plugins/renderer/plugin_placeholder.h @@ -49,7 +49,7 @@ class PluginPlaceholder : public content::RenderViewObserver, void OnLoadBlockedPlugins(const std::string& identifier); void OnSetIsPrerendering(bool is_prerendering); - void SetMessage(const string16& message); + void SetMessage(const base::string16& message); void SetPluginInfo(const content::WebPluginInfo& plugin_info); const content::WebPluginInfo& GetPluginInfo() const; void SetIdentifier(const std::string& identifier); @@ -100,7 +100,7 @@ class PluginPlaceholder : public content::RenderViewObserver, content::WebPluginInfo plugin_info_; - string16 message_; + base::string16 message_; // True iff the plugin was blocked because the page was being prerendered. // Plugin will automatically be loaded when the page is displayed. |