chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm - Issue 11365181: Remove GetExtensionService from Profile.

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/cocoa/location_bar/location_bar_view_mac.mm

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: replace missing extension_system include Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

index 3f88673c3cdf99421be226aa86b551fe9ae1c22f..e972af9283789c844642d03b0f86bc078634b4b4 100644

--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -19,6 +19,7 @@

#include "chrome/browser/extensions/api/tabs/tabs.h"

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

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

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

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

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

#include "chrome/browser/prefs/pref_service.h"

@@ -561,8 +562,8 @@ NSImage* LocationBarViewMac::GetKeywordImage(const string16& keyword) {

const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(

profile_)->GetTemplateURLForKeyword(keyword);

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

- return profile_->GetExtensionService()->GetOmniboxIcon(

- template_url->GetExtensionId()).AsNSImage();

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

+ GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();

}

return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);