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

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

Issue 11066043: Block NPAPI plug-ins in Metro mode instead of not loading them at all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 2 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') | chrome/browser/plugins/plugin_observer.h » ('j') | 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 5da238c0edabd762278daddfbc0073e7cde98053..7861f1f2f4efd6be17827a4c7e0d26b036e43baf 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -437,18 +437,13 @@ void PluginInstallerInfoBarDelegate::ReplaceWithInfoBar(
// PluginMetroModeInfoBarDelegate ---------------------------------------------
#if defined(OS_WIN)
-InfoBarDelegate* PluginMetroModeInfoBarDelegate::Create(
- InfoBarService* infobar_service, const string16& plugin_name) {
- string16 message = l10n_util::GetStringFUTF16(
- IDS_METRO_MISSING_PLUGIN_PROMPT, plugin_name);
- return new PluginMetroModeInfoBarDelegate(
- infobar_service, message);
-}
-
PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
- InfoBarService* infobar_service, const string16& message)
+ InfoBarService* infobar_service,
+ const string16& message,
+ const string16& ok_label)
: ConfirmInfoBarDelegate(infobar_service),
- message_(message) {
+ message_(message),
+ ok_label_(ok_label) {
}
PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
@@ -470,7 +465,7 @@ int PluginMetroModeInfoBarDelegate::GetButtons() const {
string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
DCHECK_EQ(BUTTON_OK, button);
- return l10n_util::GetStringUTF16(IDS_WIN8_DESKTOP_RESTART);
+ return ok_label_;
}
bool PluginMetroModeInfoBarDelegate::Accept() {
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.h ('k') | chrome/browser/plugins/plugin_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698