chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.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/views/extensions/extension_installed_bubble.cc ('k') | chrome/browser/ui/webui/options/search_engine_manager_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc

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

index e1673062c1a36171bae18c256974220f9f74507a..02aad649be57a0099a9c50b3984b2f704963c01d 100644

--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc

+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -14,8 +14,7 @@

#include "chrome/browser/alternate_nav_url_fetcher.h"

#include "chrome/browser/command_updater.h"

#include "chrome/browser/defaults.h"

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

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

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

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

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

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

@@ -756,8 +755,8 @@ void LocationBarView::Layout() {

TemplateURLServiceFactory::GetForProfile(profile_)->

GetTemplateURLForKeyword(keyword);

if (template_url && template_url->IsExtensionKeyword()) {

- gfx::Image image = extensions::ExtensionSystem::Get(profile_)->

- extension_service()->GetOmniboxIcon(template_url->GetExtensionId());

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

+ GetOmniboxIcon(template_url->GetExtensionId());

selected_keyword_view_->SetImage(image.AsImageSkia());

selected_keyword_view_->set_is_extension_icon(true);

} else {