diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:14:25 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:14:25 +0000 |
| commit | 5fa667443b9c3bfacaa5aaacc48951ea55920969 (patch) | |
| tree | a2b33927bca9d1898d6a87f1229dfb97258957a0 /chrome/browser/extensions/ntp_overridden_bubble_controller.cc | |
| parent | 06d28020a12597c1381daa0542938f3320e849bc (diff) | |
| download | chromium_src-5fa667443b9c3bfacaa5aaacc48951ea55920969.zip chromium_src-5fa667443b9c3bfacaa5aaacc48951ea55920969.tar.gz chromium_src-5fa667443b9c3bfacaa5aaacc48951ea55920969.tar.bz2 | |
Add an extension override bubble and warning box for proxy extensions.
Also use the browser action highlighting for extensions that have a browser action icon.
BUG=381291
R=dbeam@chromium.org, rdevlin.cronin@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/288923004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275229 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( |