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 UI_BASE_IME_CANDIDATE_WINDOW_H_ | 5 #ifndef UI_BASE_IME_CANDIDATE_WINDOW_H_ |
6 #define UI_BASE_IME_CANDIDATE_WINDOW_H_ | 6 #define UI_BASE_IME_CANDIDATE_WINDOW_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <string> | 11 #include <string> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | |
15 #include "ui/base/ime/infolist_entry.h" | 15 #include "ui/base/ime/infolist_entry.h" |
16 #include "ui/base/ime/ui_base_ime_export.h" | 16 #include "ui/base/ime/ui_base_ime_export.h" |
17 | 17 |
18 namespace ui { | 18 namespace ui { |
19 | 19 |
20 // CandidateWindow represents the structure of candidates generated from IME. | 20 // CandidateWindow represents the structure of candidates generated from IME. |
21 class UI_BASE_IME_EXPORT CandidateWindow { | 21 class UI_BASE_IME_EXPORT CandidateWindow { |
22 public: | 22 public: |
23 enum Orientation { | 23 enum Orientation { |
24 HORIZONTAL = 0, | 24 HORIZONTAL = 0, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 std::vector<Entry>* mutable_candidates() { return &candidates_; } | 117 std::vector<Entry>* mutable_candidates() { return &candidates_; } |
118 | 118 |
119 bool show_window_at_composition() const { | 119 bool show_window_at_composition() const { |
120 return property_->show_window_at_composition; | 120 return property_->show_window_at_composition; |
121 } | 121 } |
122 void set_show_window_at_composition(bool show_window_at_composition) { | 122 void set_show_window_at_composition(bool show_window_at_composition) { |
123 property_->show_window_at_composition = show_window_at_composition; | 123 property_->show_window_at_composition = show_window_at_composition; |
124 } | 124 } |
125 | 125 |
126 private: | 126 private: |
127 scoped_ptr<CandidateWindowProperty> property_; | 127 std::unique_ptr<CandidateWindowProperty> property_; |
128 std::vector<Entry> candidates_; | 128 std::vector<Entry> candidates_; |
129 | 129 |
130 DISALLOW_COPY_AND_ASSIGN(CandidateWindow); | 130 DISALLOW_COPY_AND_ASSIGN(CandidateWindow); |
131 }; | 131 }; |
132 | 132 |
133 } // namespace ui | 133 } // namespace ui |
134 | 134 |
135 #endif // UI_BASE_IME_CANDIDATE_WINDOW_H_ | 135 #endif // UI_BASE_IME_CANDIDATE_WINDOW_H_ |
OLD | NEW |