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

Unified Diff: chrome/browser/media/protected_media_identifier_infobar_delegate.cc

Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed a change in prev patch Created 5 years, 8 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/android/chromium_application.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/protected_media_identifier_infobar_delegate.cc
diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
index 33af2ddacc4c8dffcda42d8e0d5d40cea8c0d5ba..deb24c103e475757c74aa00c5cc8b441e5e2c062 100644
--- a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
+++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/content_settings/permission_queue_controller.h"
#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/infobars/core/infobar.h"
#include "content/public/browser/navigation_entry.h"
@@ -14,14 +15,6 @@
#include "net/base/net_util.h"
#include "ui/base/l10n/l10n_util.h"
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/chromium_application.h"
-#endif
-
-#if defined(OS_CHROMEOS)
-#include "chrome/common/url_constants.h"
-#endif
-
// static
infobars::InfoBar* ProtectedMediaIdentifierInfoBarDelegate::Create(
InfoBarService* infobar_service,
@@ -114,27 +107,16 @@ bool ProtectedMediaIdentifierInfoBarDelegate::Cancel() {
}
base::string16 ProtectedMediaIdentifierInfoBarDelegate::GetLinkText() const {
-#if defined(OS_ANDROID)
- return l10n_util::GetStringUTF16(
- IDS_PROTECTED_MEDIA_IDENTIFIER_SETTINGS_LINK);
-#else
return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
-#endif
}
bool ProtectedMediaIdentifierInfoBarDelegate::LinkClicked(
WindowOpenDisposition disposition) {
-#if defined(OS_ANDROID)
- chrome::android::ChromiumApplication::OpenProtectedContentSettings();
-#elif defined(OS_CHROMEOS)
const GURL learn_more_url(chrome::kEnhancedPlaybackNotificationLearnMoreURL);
InfoBarService::WebContentsFromInfoBar(infobar())
->OpenURL(content::OpenURLParams(
learn_more_url, content::Referrer(),
(disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
ui::PAGE_TRANSITION_LINK, false));
-#else
- NOTIMPLEMENTED();
-#endif
return false; // Do not dismiss the info bar.
}
« no previous file with comments | « chrome/browser/android/chromium_application.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698