chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.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/ui/gtk/extensions/extension_installed_bubble_gtk.cc ('k') | chrome/browser/ui/omnibox/omnibox_popup_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc

diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

index e73891547f7efbdd48e45f43f0f5bbdc675d2ff6..fc11c4b5bcd73ed3e904c9bf96b9c13b193b3c6f 100644

--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc

+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/defaults.h"

#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/api/commands/command_service_factory.h"

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

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

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

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

@@ -1367,7 +1368,7 @@ void LocationBarViewGtk::SetKeywordLabel(const string16& keyword) {

if (is_extension_keyword) {

const TemplateURL* template_url =

template_url_service->GetTemplateURLForKeyword(keyword);

- gfx::Image image = profile->GetExtensionService()->

+ gfx::Image image = extensions::OmniboxAPI::Get(profile)->

GetOmniboxIcon(template_url->GetExtensionId());

gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_),

image.ToGdkPixbuf());