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

Unified Diff: chrome/browser/plugin_infobar_delegates.cc

Issue 10928064: Fix the blocked pluigin infobar for metro mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugin_infobar_delegates.cc
===================================================================
--- chrome/browser/plugin_infobar_delegates.cc (revision 155262)
+++ chrome/browser/plugin_infobar_delegates.cc (working copy)
@@ -8,6 +8,7 @@
#include "chrome/browser/api/infobars/infobar_service.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/google/google_util.h"
+#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/plugin_observer.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/render_messages.h"
@@ -455,7 +456,7 @@
string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
DCHECK_EQ(BUTTON_OK, button);
- return l10n_util::GetStringUTF16(IDS_METRO_SWITCH_TO_DESKTOP_BUTTON);
+ return l10n_util::GetStringUTF16(IDS_WIN8_DESKTOP_RESTART);
}
bool PluginMetroModeInfoBarDelegate::Accept() {
@@ -466,11 +467,7 @@
if (!web_contents->GetURL().is_valid())
return false;
std::string url(web_contents->GetURL().spec());
- // This obscure use of the 'log usage' mask for windows 8 is documented
- // here http://goo.gl/HBOe9.
- ui::win::OpenAnyViaShell(UTF8ToUTF16(url),
- string16(),
- SEE_MASK_FLAG_LOG_USAGE);
+ browser::AttemptRestartWithModeSwitch();
return true;
}
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698