OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ | 5 #ifndef CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ |
6 #define CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ | 6 #define CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
| 10 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
11 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
12 #include "chromeos/chromeos_export.h" | 13 #include "chromeos/chromeos_export.h" |
13 #include "chromeos/dbus/services/cros_dbus_service.h" | 14 #include "chromeos/dbus/services/cros_dbus_service.h" |
14 #include "dbus/exported_object.h" | 15 #include "dbus/exported_object.h" |
15 | 16 |
16 namespace chromeos { | 17 namespace chromeos { |
17 | 18 |
18 // This class provides an API for external apps to notify | 19 // This class provides an API for external apps to notify |
19 // chrome that it should release control of the display server. | 20 // chrome that it should release control of the display server. |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 65 |
65 scoped_ptr<Delegate> delegate_; | 66 scoped_ptr<Delegate> delegate_; |
66 base::WeakPtrFactory<ConsoleServiceProvider> weak_ptr_factory_; | 67 base::WeakPtrFactory<ConsoleServiceProvider> weak_ptr_factory_; |
67 | 68 |
68 DISALLOW_COPY_AND_ASSIGN(ConsoleServiceProvider); | 69 DISALLOW_COPY_AND_ASSIGN(ConsoleServiceProvider); |
69 }; | 70 }; |
70 | 71 |
71 } // namespace chromeos | 72 } // namespace chromeos |
72 | 73 |
73 #endif // CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ | 74 #endif // CHROMEOS_DBUS_SERVICES_CONSOLE_SERVICE_PROVIDER_H_ |
OLD | NEW |