| OLD | NEW |
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_IME_INFO_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_IME_INFO_H_ |
| 6 #define ASH_SYSTEM_TRAY_IME_INFO_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_IME_INFO_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
| 12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 | 15 |
| 16 struct ASH_EXPORT IMEInfo { | 16 struct ASH_EXPORT IMEInfo { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 54 |
| 55 // The description of the property, e.g. "Switch to full punctuation mode", | 55 // The description of the property, e.g. "Switch to full punctuation mode", |
| 56 // "Hiragana". | 56 // "Hiragana". |
| 57 base::string16 name; | 57 base::string16 name; |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>; | 60 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>; |
| 61 | 61 |
| 62 } // namespace ash | 62 } // namespace ash |
| 63 | 63 |
| 64 #endif // ASH_SYSTEM_TRAY_IME_INFO_H_ | 64 #endif // ASH_COMMON_SYSTEM_TRAY_IME_INFO_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2731873002:
Revert "chromeos: Move files in //ash/common to //ash, part 1" (Closed)
