chrome/browser/ui/extensions/settings_api_bubble_helpers.cc - Issue 2206693002: Improve settings override bubble to indicate policy installed 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/ui/extensions/settings_api_bubble_helpers.cc

Issue 2206693002: Improve settings override bubble to indicate policy installed extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase master. Addressing mac code review Created 4 years, 2 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

« chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.mm ('K') | « chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc ('k') | chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h » ('j') | chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/settings_api_bubble_helpers.cc

diff --git a/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc b/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc

index 354248c59a2f1b9116b0369ed00f9256684961cb..012295b57585dfdc5b2338349b569f11100ad7e7 100644

--- a/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc

+++ b/chrome/browser/ui/extensions/settings_api_bubble_helpers.cc

@@ -72,7 +72,7 @@ void MaybeShowExtensionControlledSearchNotification(

void MaybeShowExtensionControlledNewTabPage(

Browser* browser, content::WebContents* web_contents) {

-#if !defined(OS_WIN)

+#if !defined(OS_WIN) && !defined(OS_MACOSX)

Devlin 2016/11/01 00:21:21 We shouldn't be making this change as part of this

catmullings 2016/11/01 02:46:53 Done.

return;

#endif