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

Side by Side Diff: chromeos/dbus/mock_dbus_thread_manager.h

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 8 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 unified diff | Download patch
« no previous file with comments | « chromeos/dbus/mock_cryptohome_client.cc ('k') | chromeos/dbus/mock_dbus_thread_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MOCK_DBUS_THREAD_MANAGER_H_ 5 #ifndef CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_ 6 #define CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" 10 #include "chromeos/dbus/dbus_thread_manager.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 12
13 namespace dbus { 13 namespace dbus {
14 14
15 class Bus; 15 class Bus;
16 16
17 } // namespace dbus 17 } // namespace dbus
18 18
19 namespace chromeos { 19 namespace chromeos {
20 20
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 scoped_ptr<MockPowerManagerClient> mock_power_manager_client_; 138 scoped_ptr<MockPowerManagerClient> mock_power_manager_client_;
139 scoped_ptr<MockSessionManagerClient> mock_session_manager_client_; 139 scoped_ptr<MockSessionManagerClient> mock_session_manager_client_;
140 scoped_ptr<MockSpeechSynthesizerClient> mock_speech_synthesizer_client_; 140 scoped_ptr<MockSpeechSynthesizerClient> mock_speech_synthesizer_client_;
141 scoped_ptr<MockUpdateEngineClient> mock_update_engine_client_; 141 scoped_ptr<MockUpdateEngineClient> mock_update_engine_client_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManager); 143 DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManager);
144 }; 144 };
145 145
146 } // namespace chromeos 146 } // namespace chromeos
147 147
148 #endif // CHROME_BROWSER_CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_ 148 #endif // CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/mock_cryptohome_client.cc ('k') | chromeos/dbus/mock_dbus_thread_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698