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

Side by Side Diff: chrome/browser/chromeos/dbus/dbus_thread_manager.h

Issue 8418037: chromeos: Fix UpdateScreenTest and NetworkScreenTest for Debug build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reupload Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 // Returns the session manager client, owned by DBusThreadManager. 84 // Returns the session manager client, owned by DBusThreadManager.
85 // Do not cache this pointer and use it after DBusThreadManager is shut 85 // Do not cache this pointer and use it after DBusThreadManager is shut
86 // down. 86 // down.
87 virtual SensorsClient* sensors_client() = 0; 87 virtual SensorsClient* sensors_client() = 0;
88 88
89 // Returns the session manager client, owned by DBusThreadManager. 89 // Returns the session manager client, owned by DBusThreadManager.
90 // Do not cache this pointer and use it after DBusThreadManager is shut 90 // Do not cache this pointer and use it after DBusThreadManager is shut
91 // down. 91 // down.
92 virtual SessionManagerClient* session_manager_client() = 0; 92 virtual SessionManagerClient* session_manager_client() = 0;
93 93
94 // Sets the session manager client. Takes the ownership.
95 // The function is exported for testing.
96 //
97 // TODO(satorux): Remove this once we convert tests to use
98 // MockDBusThreadManager.
99 virtual void set_session_manager_client_for_testing(
100 SessionManagerClient* session_manager_client) = 0;
101
102 // Returns the speech synthesizer client, owned by DBusThreadManager. 94 // Returns the speech synthesizer client, owned by DBusThreadManager.
103 // Do not cache this pointer and use it after DBusThreadManager is shut 95 // Do not cache this pointer and use it after DBusThreadManager is shut
104 // down. 96 // down.
105 virtual SpeechSynthesizerClient* speech_synthesizer_client() = 0; 97 virtual SpeechSynthesizerClient* speech_synthesizer_client() = 0;
106 98
107 virtual ~DBusThreadManager(); 99 virtual ~DBusThreadManager();
108 100
109 protected: 101 protected:
110 DBusThreadManager(); 102 DBusThreadManager();
111 103
112 DISALLOW_COPY_AND_ASSIGN(DBusThreadManager); 104 DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
113 }; 105 };
114 106
115 } // namespace chromeos 107 } // namespace chromeos
116 108
117 #endif // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_ 109 #endif // CHROME_BROWSER_CHROMEOS_DBUS_DBUS_THREAD_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698