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

chrome/browser/speech/chrome_speech_recognition_preferences.h

 // 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.
 
 #ifndef CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 #define CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_
 #pragma once
 
 #include "base/basictypes.h"
 #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"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/speech_recognition_preferences.h"
 
 class PrefService;
 
@@ skipping 24 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
 
   // content::SpeechRecognitionPreferences implementation.
   // Called by both Content (on IO thread) and Chrome (on UI thread).
   virtual bool FilterProfanities() const OVERRIDE;
 
   // 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
   // preferences in profile preferences, according to the Chromium Profile
   // Architecture document entitled "The New Way: ProfileKeyedServiceFactory".
 
   // Singleton that manages instantiation of ChromeSpeechRecognitionPreferences
   // handling its association with Profiles.
   class Factory : public ProfileKeyedServiceFactory {
    public:
@@ skipping 52 matching lines @@
   scoped_ptr<base::ListValue> notifications_shown_;
 
   // Lock used to ensure exclusive access to preference variables that are
   // accessed by both threads (note: mutable is required to keep getters const).
   mutable base::Lock preferences_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSpeechRecognitionPreferences);
 };
 
 #endif  // CHROME_BROWSER_SPEECH_CHROME_SPEECH_RECOGNITION_PREFERENCES_H_