chrome/browser/ui/views/browser_actions_container.cc - Issue 25366003: Moved some functions off ExtensionService into a new file extension_util.

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/views/browser_actions_container.cc

Issue 25366003: Moved some functions off ExtensionService into a new file extension_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Compile failures Created 7 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

« no previous file with comments | « chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/browser_actions_container.cc

diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc

index 850189762babaf027940beb6b62b50d63e4e86c2..2565b30522c193923fd1b4d674c62e98a87b0561 100644

--- a/chrome/browser/ui/views/browser_actions_container.cc

+++ b/chrome/browser/ui/views/browser_actions_container.cc

@@ -9,6 +9,7 @@

#include "base/stl_util.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

+#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/extensions/tab_helper.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sessions/session_tab_helper.h"

@@ -808,8 +809,9 @@ bool BrowserActionsContainer::ShouldDisplayBrowserAction(

// Only display incognito-enabled extensions while in incognito mode.

return

(!profile_->IsOffTheRecord() ||

- extensions::ExtensionSystem::Get(profile_)->extension_service()->

- IsIncognitoEnabled(extension->id()));

+ extension_util::IsIncognitoEnabled(

+ extension->id(),

+ extensions::ExtensionSystem::Get(profile_)->extension_service()));

}

void BrowserActionsContainer::ShowPopup(