| OLD | NEW |
| 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 ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 typedef std::vector<IMEPropertyInfo> IMEPropertyInfoList; | 85 typedef std::vector<IMEPropertyInfo> IMEPropertyInfoList; |
| 86 | 86 |
| 87 struct ASH_EXPORT IMEInfo { | 87 struct ASH_EXPORT IMEInfo { |
| 88 IMEInfo(); | 88 IMEInfo(); |
| 89 ~IMEInfo(); | 89 ~IMEInfo(); |
| 90 | 90 |
| 91 bool selected; | 91 bool selected; |
| 92 bool third_party; | 92 bool third_party; |
| 93 std::string id; | 93 std::string id; |
| 94 string16 name; | 94 string16 name; |
| 95 string16 medium_name; |
| 95 string16 short_name; | 96 string16 short_name; |
| 96 }; | 97 }; |
| 97 | 98 |
| 98 typedef std::vector<IMEInfo> IMEInfoList; | 99 typedef std::vector<IMEInfo> IMEInfoList; |
| 99 | 100 |
| 100 class VolumeControlDelegate; | 101 class VolumeControlDelegate; |
| 101 | 102 |
| 102 class SystemTrayDelegate { | 103 class SystemTrayDelegate { |
| 103 public: | 104 public: |
| 104 virtual ~SystemTrayDelegate() {} | 105 virtual ~SystemTrayDelegate() {} |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 273 |
| 273 // Sets VolumeControlDelegate. | 274 // Sets VolumeControlDelegate. |
| 274 virtual void SetVolumeControlDelegate( | 275 virtual void SetVolumeControlDelegate( |
| 275 scoped_ptr<VolumeControlDelegate> delegate) = 0; | 276 scoped_ptr<VolumeControlDelegate> delegate) = 0; |
| 276 | 277 |
| 277 }; | 278 }; |
| 278 | 279 |
| 279 } // namespace ash | 280 } // namespace ash |
| 280 | 281 |
| 281 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 282 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |