chrome/browser/speech/chrome_speech_recognition_preferences.h - 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.h

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_manager_delegate.cc ('k') | chrome/browser/speech/chrome_speech_recognition_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/speech/chrome_speech_recognition_preferences.h

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

index 478c01719cb1bd0bb481c0a7ae34af8df6cd3a19..44950e29d87462c866c9aa785a7cef60736105d9 100644

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

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

@@ -10,7 +10,6 @@

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/singleton.h"

-#include "base/string16.h"

#include "base/synchronization/lock.h"

#include "base/threading/non_thread_safe.h"

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

@@ -55,8 +54,8 @@ class ChromeSpeechRecognitionPreferences

// Called only by Chrome (on UI thread).

void SetFilterProfanities(bool filter_profanities);

void ToggleFilterProfanities();

- bool ShouldShowSecurityNotification(const string16& context_name) const;

- void SetHasShownSecurityNotification(const string16& context_name);

+ bool ShouldShowSecurityNotification(const std::string& context_name) const;

+ void SetHasShownSecurityNotification(const std::string& context_name);

private:

// The two classes below are needed to handle storage of speech recognition