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

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

Issue 11667015: For the Metro mode infobar, move various variables from the caller side to the (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years 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.cc » ('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
===================================================================
--- chrome/browser/plugins/plugin_infobar_delegates.cc (revision 174623)
+++ chrome/browser/plugins/plugin_infobar_delegates.cc (working copy)
@@ -438,15 +438,11 @@
#if defined(OS_WIN)
PluginMetroModeInfoBarDelegate::PluginMetroModeInfoBarDelegate(
InfoBarService* infobar_service,
- const string16& message,
- const string16& ok_label,
- const GURL& learn_more_url,
- bool show_dont_ask_again_button)
+ PluginMetroModeInfoBarDelegate::Mode mode,
+ const string16& name)
: ConfirmInfoBarDelegate(infobar_service),
- message_(message),
- ok_label_(ok_label),
- learn_more_url_(learn_more_url),
- show_dont_ask_again_button_(show_dont_ask_again_button) {
+ mode_(mode),
+ name_(name) {
}
PluginMetroModeInfoBarDelegate::~PluginMetroModeInfoBarDelegate() {
@@ -458,26 +454,20 @@
}
string16 PluginMetroModeInfoBarDelegate::GetMessageText() const {
- return message_;
+ return l10n_util::GetStringFUTF16((mode_ == MISSING_PLUGIN) ?
+ IDS_METRO_MISSING_PLUGIN_PROMPT : IDS_METRO_NPAPI_PLUGIN_PROMPT, name_);
}
int PluginMetroModeInfoBarDelegate::GetButtons() const {
- int buttons = BUTTON_OK;
- if (show_dont_ask_again_button_)
- buttons |= BUTTON_CANCEL;
- return buttons;
+ return (mode_ == MISSING_PLUGIN) ? BUTTON_OK : (BUTTON_OK | BUTTON_CANCEL);
}
string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
- if (button == BUTTON_OK)
- return ok_label_;
- if (button == BUTTON_CANCEL) {
- DCHECK(show_dont_ask_again_button_);
+ if (button == BUTTON_CANCEL)
return l10n_util::GetStringUTF16(IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL);
- }
- NOTREACHED();
- return string16();
+ return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
+ IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_RESTART);
}
bool PluginMetroModeInfoBarDelegate::Accept() {
@@ -486,7 +476,7 @@
}
bool PluginMetroModeInfoBarDelegate::Cancel() {
- DCHECK(show_dont_ask_again_button_);
+ DCHECK_EQ(DESKTOP_MODE_REQUIRED, mode_);
content::WebContents* web_contents = owner()->GetWebContents();
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
@@ -509,7 +499,10 @@
bool PluginMetroModeInfoBarDelegate::LinkClicked(
WindowOpenDisposition disposition) {
OpenURLParams params(
- learn_more_url_, Referrer(),
+ GURL((mode_ == MISSING_PLUGIN) ?
+ "https://support.google.com/chrome/?ib_display_in_desktop" :
+ "https://support.google.com/chrome/?ib_redirect_to_desktop"),
+ Referrer(),
(disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
content::PAGE_TRANSITION_LINK, false);
owner()->GetWebContents()->OpenURL(params);
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.h ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698