| Index: chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.h b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| index 0e8b1e38768aba3f0cb0c84d8e796a3ff07eb967..2ac41f6f1af3f211277e0732465015b9256633be 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.h
|
| @@ -21,9 +21,9 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| const blink::WebPluginParams& params,
|
| const content::WebPluginInfo& info,
|
| const std::string& identifier,
|
| - const string16& name,
|
| + const base::string16& name,
|
| int resource_id,
|
| - const string16& message);
|
| + const base::string16& message);
|
|
|
| // Creates a new WebViewPlugin with a MissingPlugin as a delegate.
|
| static ChromePluginPlaceholder* CreateMissingPlugin(
|
| @@ -46,7 +46,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| blink::WebFrame* frame,
|
| const blink::WebPluginParams& params,
|
| const std::string& html_data,
|
| - const string16& title);
|
| + const base::string16& title);
|
| virtual ~ChromePluginPlaceholder();
|
|
|
| // WebViewPlugin::Delegate (via PluginPlaceholder) method
|
| @@ -74,7 +74,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| void OnSetIsPrerendering(bool is_prerendering);
|
| #if defined(ENABLE_PLUGIN_INSTALLATION)
|
| void OnDidNotFindMissingPlugin();
|
| - void OnFoundMissingPlugin(const string16& plugin_name);
|
| + void OnFoundMissingPlugin(const base::string16& plugin_name);
|
| void OnStartedDownloadingPlugin();
|
| void OnFinishedDownloadingPlugin();
|
| void OnErrorDownloadingPlugin(const std::string& error);
|
| @@ -85,7 +85,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
| // an IPC message file which can't be easily included in other header files.
|
| scoped_ptr<ChromeViewHostMsg_GetPluginInfo_Status> status_;
|
|
|
| - string16 title_;
|
| + base::string16 title_;
|
|
|
| #if defined(ENABLE_PLUGIN_INSTALLATION)
|
| // |routing_id()| is the routing ID of our associated RenderView, but we have
|
| @@ -95,7 +95,7 @@ class ChromePluginPlaceholder : public plugins::PluginPlaceholder,
|
|
|
| bool has_host_;
|
| int context_menu_request_id_; // Nonzero when request pending.
|
| - string16 plugin_name_;
|
| + base::string16 plugin_name_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromePluginPlaceholder);
|
| };
|
|
|