chrome/browser/ui/app_list/search/app_search_provider.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/app_list/search/app_search_provider.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/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search/app_search_provider.cc

diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc

index ceba03f9c412d5ac77312d7503296a8db1cd983a..c7fc5f0ddf957bb03a001fcfe2c88b75b10ab4a1 100644

--- a/chrome/browser/ui/app_list/search/app_search_provider.cc

+++ b/chrome/browser/ui/app_list/search/app_search_provider.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/chrome_notification_types.h"

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

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

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

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

#include "chrome/browser/ui/app_list/search/app_result.h"

#include "chrome/browser/ui/app_list/search/tokenized_string.h"

@@ -82,7 +83,7 @@ void AppSearchProvider::AddApps(const ExtensionSet* extensions,

continue;

if (profile_->IsOffTheRecord() &&

- !service->CanLoadInIncognito(app))

+ !extension_util::CanLoadInIncognito(app, service))

continue;

apps_.push_back(new App(app));

}