diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 00:44:23 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-07 00:44:23 +0000 |
| commit | 8dc56d0f6ed6e59c93b20ef0d4cec99e411ed050 (patch) | |
| tree | eda45fac6d66144d799e583b438dd78c0e3ef6e4 /chrome/browser/extensions/ntp_overridden_bubble_controller.cc | |
| parent | 8f4bba4f2f7a0d75ebd66955b53af2876ef267e5 (diff) | |
| download | chromium_src-8dc56d0f6ed6e59c93b20ef0d4cec99e411ed050.zip chromium_src-8dc56d0f6ed6e59c93b20ef0d4cec99e411ed050.tar.gz chromium_src-8dc56d0f6ed6e59c93b20ef0d4cec99e411ed050.tar.bz2 | |
Add an extension override bubble and warning box for proxy extensions. (2nd attempt, this time with two one-liner test fixes)
Also use the browser action highlighting for extensions that have a browser action icon.
NOTE: This CL was already green-lighted here:
https://codereview.chromium.org/288923004/
BUG=381291
TBR=sky, devlin, dbeam
Review URL: https://codereview.chromium.org/320633002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/ntp_overridden_bubble_controller.cc')
| -rw-r--r-- | chrome/browser/extensions/ntp_overridden_bubble_controller.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc index d832ce4..6abec00 100644 --- a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc +++ b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc @@ -36,7 +36,8 @@ class NtpOverriddenBubbleDelegate user_action) OVERRIDE; virtual void PerformAction(const extensions::ExtensionIdList& list) OVERRIDE; virtual base::string16 GetTitle() const OVERRIDE; - virtual base::string16 GetMessageBody() const OVERRIDE; + virtual base::string16 GetMessageBody( + bool anchored_to_browser_action) const OVERRIDE; virtual base::string16 GetOverflowText( const base::string16& overflow_count) const OVERRIDE; virtual base::string16 GetLearnMoreLabel() const OVERRIDE; @@ -113,7 +114,8 @@ base::string16 NtpOverriddenBubbleDelegate::GetTitle() const { IDS_EXTENSIONS_NTP_CONTROLLED_TITLE_HOME_PAGE_BUBBLE); } -base::string16 NtpOverriddenBubbleDelegate::GetMessageBody() const { +base::string16 NtpOverriddenBubbleDelegate::GetMessageBody( + bool anchored_to_browser_action) const { base::string16 body = l10n_util::GetStringUTF16(IDS_EXTENSIONS_NTP_CONTROLLED_FIRST_LINE); body += l10n_util::GetStringUTF16( |