chrome/browser/ui/app_list/search_builder.cc - Issue 11446034: SupportsUserData and manifest handlers for Extension; use them for the Omnibox API.

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_builder.cc

Issue 11446034: SupportsUserData and manifest handlers for Extension; use them for the Omnibox API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase + manifestdata Created 8 years 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/search_engines/template_url_service.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search_builder.cc

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

index 86d195e080e2e2ed0c359598522c9f29e45db74f..540e8fa5535280ac7063097711f5904dcb372a9d 100644

--- a/chrome/browser/ui/app_list/search_builder.cc

+++ b/chrome/browser/ui/app_list/search_builder.cc

@@ -15,6 +15,7 @@

#include "chrome/browser/autocomplete/autocomplete_provider.h"

#include "chrome/browser/autocomplete/autocomplete_result.h"

#include "chrome/browser/event_disposition.h"

+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"

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

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

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

@@ -171,7 +172,7 @@ class ExtensionAppResult : public SearchBuilderResult,

private:

void LoadExtensionIcon(const extensions::Extension* extension) {

- const gfx::ImageSkia default_icon = profile()->GetExtensionService()->

+ const gfx::ImageSkia default_icon = extensions::OmniboxAPI::Get(profile())->

GetOmniboxPopupIcon(extension->id()).AsImageSkia();

icon_.reset(new extensions::IconImage(

extension,