chrome/browser/search/hotword_service_factory.cc - Issue 289063012: [Hotword] Add error message display back in. Add error messages for NaCl. Add metrics for errors.

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

Issue 289063012: [Hotword] Add error message display back in. Add error messages for NaCl. Add metrics for errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: android compile error Created 6 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« chrome/app/generated_resources.grd ('K') | « chrome/browser/search/hotword_service_factory.h ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search/hotword_service_factory.cc

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

index ba1d669806cdf8c55c6067584dec43bec0a000c1..6cc494948981ce9506e75323086ab028342a2083 100644

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

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

@@ -44,9 +44,11 @@ bool HotwordServiceFactory::IsHotwordAllowed(BrowserContext* context) {

}

// static

-bool HotwordServiceFactory::RetryHotwordExtension(Profile* profile) {

- HotwordService* hotword_service = GetForProfile(profile);

- return hotword_service && hotword_service->RetryHotwordExtension();

+int HotwordServiceFactory::GetCurrentError(BrowserContext* context) {

+ HotwordService* hotword_service = GetForProfile(context);

+ if (!hotword_service)

+ return 0;

+ return hotword_service->error_message();

}

HotwordServiceFactory::HotwordServiceFactory()