Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: chrome/browser/chromeos/dbus/dbus_thread_manager.h

Issue 8334018: Move the code in libcros' chromeos_speech_synthesis.cc into Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments and copyright, cleaned up includes Created 9 years, 2 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
Index: chrome/browser/chromeos/dbus/dbus_thread_manager.h
diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.h b/chrome/browser/chromeos/dbus/dbus_thread_manager.h
index 889778fb62f9c483c06956164c84abb3337848f3..dc64f0ec1a10d2374658b7a109729b9ab9b337aa 100644
--- a/chrome/browser/chromeos/dbus/dbus_thread_manager.h
+++ b/chrome/browser/chromeos/dbus/dbus_thread_manager.h
@@ -22,6 +22,7 @@ namespace chromeos {
class CrosDBusService;
class PowerManagerClient;
class SensorsSource;
+class SpeechSynthesizerClient;
// DBusThreadManager manages the D-Bus thread, the thread dedicated to
// handling asynchronous D-Bus operations.
@@ -61,6 +62,13 @@ class DBusThreadManager {
return power_manager_client_.get();
}
+ // Returns the speech synthesizer client, owned by DBusThreadManager.
+ // Do not cache this pointer and use it after DBusThreadManager is shut
+ // down.
+ SpeechSynthesizerClient* speech_synthesizer_client() {
+ return speech_synthesizer_client_.get();
+ }
+
private:
DBusThreadManager();
virtual ~DBusThreadManager();
@@ -70,6 +78,7 @@ class DBusThreadManager {
CrosDBusService* cros_dbus_service_;
scoped_ptr<SensorsSource> sensors_source_;
scoped_ptr<PowerManagerClient> power_manager_client_;
+ scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
};

Powered by Google App Engine
This is Rietveld 408576698