Moving tray icon and notification balloon for background speech recognition sessions to ChromeSpeec…

chrome/browser/speech/chrome_speech_recognition_preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 142 matching lines @@
                                      filter_profanities);
   }
 }
 
 void ChromeSpeechRecognitionPreferences::ToggleFilterProfanities() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SetFilterProfanities(!FilterProfanities());
 }
 
 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(
       base::Value::CreateStringValue(context_name));
   return notifications_shown_->Find(*match_name) == notifications_shown_->end();
 }
 
 void ChromeSpeechRecognitionPreferences::SetHasShownSecurityNotification(
-    const string16& context_name) {
+    const std::string& context_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(notifications_shown_.get());
   notifications_shown_->AppendIfNotPresent(
       base::Value::CreateStringValue(context_name));
   if (profile_) {
     profile_->GetPrefs()->Set(
         prefs::kSpeechRecognitionTrayNotificationShownContexts,
         *notifications_shown_);
   }
 }
 
 void ChromeSpeechRecognitionPreferences::ReloadPreference(
     const std::string& key) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile_);
   base::AutoLock write_lock(preferences_lock_);
   PrefService* pref_service = profile_->GetPrefs();
   if (key == prefs::kSpeechRecognitionFilterProfanities) {
     filter_profanities_ =
           pref_service->GetBoolean(prefs::kSpeechRecognitionFilterProfanities);
   } else if (key == prefs::kSpeechRecognitionTrayNotificationShownContexts) {
     const base::ListValue* pref_list = profile_->GetPrefs()->GetList(
         prefs::kSpeechRecognitionTrayNotificationShownContexts);
     DCHECK(pref_list);
     notifications_shown_.reset(pref_list->DeepCopy());
   }
 }