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

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

Issue 498573003: Add relaunch into ASH and desktop support for Chrome on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed menu strings to Chrome OS mode Created 6 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
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 e1ef089f35596c2465732e7852e249d2174a8a2f..d0e76d714806c96e6a48739bf2a143244f3be41e 100644
--- a/chrome/browser/plugins/plugin_infobar_delegates.cc
+++ b/chrome/browser/plugins/plugin_infobar_delegates.cc
@@ -482,15 +482,9 @@ int PluginMetroModeInfoBarDelegate::GetButtons() const {
base::string16 PluginMetroModeInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
-#if defined(USE_AURA) && defined(USE_ASH)
- return l10n_util::GetStringUTF16(IDS_WIN8_DESKTOP_RESTART);
-#else
- return l10n_util::GetStringUTF16((mode_ == MISSING_PLUGIN) ?
- IDS_WIN8_DESKTOP_RESTART : IDS_WIN8_DESKTOP_OPEN);
-#endif
+ return l10n_util::GetStringUTF16(IDS_WIN_DESKTOP_RESTART);
}
-#if defined(USE_AURA) && defined(USE_ASH)
void LaunchDesktopInstanceHelper(const base::string16& url) {
base::FilePath exe_path;
if (!PathService::Get(base::FILE_EXE, &exe_path))
@@ -504,7 +498,6 @@ void LaunchDesktopInstanceHelper(const base::string16& url) {
aura::RemoteWindowTreeHostWin::Instance()->HandleOpenURLOnDesktop(
shortcut_path, url);
}
-#endif
bool PluginMetroModeInfoBarDelegate::Accept() {
chrome::AttemptRestartToDesktopMode();

Powered by Google App Engine
This is Rietveld 408576698