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

Side by Side Diff: ui/base/ime/candidate_window.h

Issue 162723003: Migrate CandidateWindow::Entry to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest compilation Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 23 matching lines...) Expand all
34 // Auxiliary text is typically displayed in the footer of the candidate 34 // Auxiliary text is typically displayed in the footer of the candidate
35 // window. 35 // window.
36 std::string auxiliary_text; 36 std::string auxiliary_text;
37 bool is_auxiliary_text_visible; 37 bool is_auxiliary_text_visible;
38 }; 38 };
39 39
40 // Represents a candidate entry. 40 // Represents a candidate entry.
41 struct UI_BASE_EXPORT Entry { 41 struct UI_BASE_EXPORT Entry {
42 Entry(); 42 Entry();
43 virtual ~Entry(); 43 virtual ~Entry();
44 std::string value; 44 base::string16 value;
45 std::string label; 45 base::string16 label;
46 std::string annotation; 46 base::string16 annotation;
47 std::string description_title; 47 base::string16 description_title;
48 std::string description_body; 48 base::string16 description_body;
49 }; 49 };
50 50
51 CandidateWindow(); 51 CandidateWindow();
52 virtual ~CandidateWindow(); 52 virtual ~CandidateWindow();
53 53
54 // Returns true if the given |candidate_window| is equal to myself. 54 // Returns true if the given |candidate_window| is equal to myself.
55 bool IsEqual(const CandidateWindow& candidate_window) const; 55 bool IsEqual(const CandidateWindow& candidate_window) const;
56 56
57 // Copies |candidate_window| to myself. 57 // Copies |candidate_window| to myself.
58 void CopyFrom(const CandidateWindow& candidate_window); 58 void CopyFrom(const CandidateWindow& candidate_window);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 private: 122 private:
123 scoped_ptr<CandidateWindowProperty> property_; 123 scoped_ptr<CandidateWindowProperty> property_;
124 std::vector<Entry> candidates_; 124 std::vector<Entry> candidates_;
125 125
126 DISALLOW_COPY_AND_ASSIGN(CandidateWindow); 126 DISALLOW_COPY_AND_ASSIGN(CandidateWindow);
127 }; 127 };
128 128
129 } // namespace ui 129 } // namespace ui
130 130
131 #endif // UI_BASE_IME_CANDIDATE_WINDOW_H_ 131 #endif // UI_BASE_IME_CANDIDATE_WINDOW_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc ('k') | ui/base/ime/candidate_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698