| Index: chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| index 70f97311f31d56351f81d7e68243af539643d68a..18abbfc7e4cbd7796f7e714f2a3fcd03c3a0c830 100644
|
| --- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc
|
| @@ -51,7 +51,7 @@ ChromePluginPlaceholder::ChromePluginPlaceholder(
|
| blink::WebFrame* frame,
|
| const blink::WebPluginParams& params,
|
| const std::string& html_data,
|
| - const string16& title)
|
| + const base::string16& title)
|
| : plugins::PluginPlaceholder(render_view,
|
| frame,
|
| params,
|
| @@ -145,9 +145,9 @@ ChromePluginPlaceholder* ChromePluginPlaceholder::CreateBlockedPlugin(
|
| const WebPluginParams& params,
|
| const content::WebPluginInfo& plugin,
|
| const std::string& identifier,
|
| - const string16& name,
|
| + const base::string16& name,
|
| int template_id,
|
| - const string16& message) {
|
| + const base::string16& message) {
|
| base::DictionaryValue values;
|
| values.SetString("message", message);
|
| values.SetString("name", name);
|
| @@ -235,7 +235,7 @@ void ChromePluginPlaceholder::OnDidNotFindMissingPlugin() {
|
| }
|
|
|
| void ChromePluginPlaceholder::OnFoundMissingPlugin(
|
| - const string16& plugin_name) {
|
| + const base::string16& plugin_name) {
|
| if (status_->value == ChromeViewHostMsg_GetPluginInfo_Status::kNotFound)
|
| SetMessage(l10n_util::GetStringFUTF16(IDS_PLUGIN_FOUND, plugin_name));
|
| has_host_ = true;
|
|
|