chrome/browser/extensions/ntp_overridden_bubble_controller.cc - Issue 288923004: Add an extension override bubble and warning box for proxy extensions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/ntp_overridden_bubble_controller.cc

Issue 288923004: Add an extension override bubble and warning box for proxy extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tests Created 6 years, 6 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/extensions/extension_message_bubble_controller_unittest.cc ('k') | chrome/browser/extensions/proxy_overridden_bubble_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/ntp_overridden_bubble_controller.cc

diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc

index d832ce49d400d07ab3e148e56751a8ff1e8b85ed..6abec00552fcf46ebce89e659ecbeff336c7dccf 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(