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

Unified Diff: chrome/browser/plugins/plugin_infobar_delegates.cc

Issue 23591005: Update infobar buttons when attempting to run an NPAPI plugin in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change string to say open. Created 7 years, 4 months 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
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_infobar_delegates.cc
diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc
index e4a26518266539ba324d83099ba51e18ae2896de..2be3b11e5e6a24c8030b7e3b63ced04a2af3d9f7 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -476,15 +476,13 @@ string16 PluginMetroModeInfoBarDelegate::GetMessageText() const {
}
int PluginMetroModeInfoBarDelegate::GetButtons() const {
- return (mode_ == MISSING_PLUGIN) ? BUTTON_OK : (BUTTON_OK | BUTTON_CANCEL);
+ return BUTTON_OK;
}
string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
- if (button == BUTTON_CANCEL)
- return l10n_util::GetStringUTF16(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
- IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_RESTART);
+ IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_DESKTOP_OPEN);
}
void LaunchDesktopInstanceHelper(const string16& url) {
@@ -516,17 +514,6 @@ bool PluginMetroModeInfoBarDelegate::Accept() {
return true;
}
-bool PluginMetroModeInfoBarDelegate::Cancel() {
- DCHECK_EQ(DESKTOP_MODE_REQUIRED, mode_);
- Profile::FromBrowserContext(web_contents()->GetBrowserContext())->
- GetHostContentSettingsMap()->SetContentSetting(
- ContentSettingsPattern::FromURL(web_contents()->GetURL()),
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_METRO_SWITCH_TO_DESKTOP, std::string(),
- CONTENT_SETTING_BLOCK);
- return true;
-}
-
string16 PluginMetroModeInfoBarDelegate::GetLinkText() const {
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
}
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698