chrome/browser/speech/chrome_speech_recognition_preferences.cc - Issue 10407120: Moving tray icon and notification balloon for background speech recognition sessions to ChromeSpeec…

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/speech/chrome_speech_recognition_preferences.cc

Issue 10407120: Moving tray icon and notification balloon for background speech recognition sessions to ChromeSpeec… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed win issued ("interface" member clashes with a VS macro name, sigh) Created 8 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:

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

Download patch

« no previous file with comments | « chrome/browser/speech/chrome_speech_recognition_preferences.h ('k') | chrome/browser/speech/speech_input_extension_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/chrome_speech_recognition_preferences.cc

diff --git a/chrome/browser/speech/chrome_speech_recognition_preferences.cc b/chrome/browser/speech/chrome_speech_recognition_preferences.cc

index 8faf8619fd375c83d99a9bf9b5c506f9d461a6dc..388cb2df0cbfdf0753f59558ad2d63767ae3a84d 100644

--- a/chrome/browser/speech/chrome_speech_recognition_preferences.cc

+++ b/chrome/browser/speech/chrome_speech_recognition_preferences.cc

@@ -160,7 +160,7 @@ void ChromeSpeechRecognitionPreferences::ToggleFilterProfanities() {

}

bool ChromeSpeechRecognitionPreferences::ShouldShowSecurityNotification(

- const string16& context_name) const {

+ const std::string& context_name) const {

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

DCHECK(notifications_shown_.get());

scoped_ptr<base::StringValue> match_name(

@@ -169,7 +169,7 @@ bool ChromeSpeechRecognitionPreferences::ShouldShowSecurityNotification(

}

void ChromeSpeechRecognitionPreferences::SetHasShownSecurityNotification(

- const string16& context_name) {

+ const std::string& context_name) {

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

DCHECK(notifications_shown_.get());

notifications_shown_->AppendIfNotPresent(