chrome/browser/search/hotword_service.cc - Issue 349073004: Cleanup: Remove deprecated Profile::GetExtensionService().

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/search/hotword_service.cc

Issue 349073004: Cleanup: Remove deprecated Profile::GetExtensionService(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix typo Created 6 years, 6 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:

Index: chrome/browser/search/hotword_service.cc

diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc

index b409ee9e544d36d0c9028f0943abf5ee25521750..f7f8aeddb8ebf2d4bf0b360ea86f9d669160dc1f 100644

--- a/chrome/browser/search/hotword_service.cc

+++ b/chrome/browser/search/hotword_service.cc

@@ -140,13 +140,11 @@ void RecordErrorMetrics(int error_message) {

}

ExtensionService* GetExtensionService(Profile* profile) {

- CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

extensions::ExtensionSystem* extension_system =

extensions::ExtensionSystem::Get(profile);

- if (extension_system)

- return extension_system->extension_service();

- return NULL;

+ return extension_system ? extension_system->extension_service() : NULL;

}

std::string GetCurrentLocale(Profile* profile) {