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

Side by Side Diff: ui/chromeos/ime/candidate_window_view.h

Issue 2474163003: Remove stl_util's deletion function use from ui/. (Closed)
Patch Set: braces Created 4 years, 1 month 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
« no previous file with comments | « no previous file | ui/chromeos/ime/candidate_window_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_ 5 #ifndef UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_
6 #define UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_ 6 #define UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "ui/base/ime/candidate_window.h" 11 #include "ui/base/ime/candidate_window.h"
10 #include "ui/chromeos/ui_chromeos_export.h" 12 #include "ui/chromeos/ui_chromeos_export.h"
11 #include "ui/views/bubble/bubble_dialog_delegate.h" 13 #include "ui/views/bubble/bubble_dialog_delegate.h"
12 #include "ui/views/controls/button/button.h" 14 #include "ui/views/controls/button/button.h"
13 15
14 namespace ui { 16 namespace ui {
15 namespace ime { 17 namespace ime {
16 18
17 class CandidateView; 19 class CandidateView;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // The observers of the object. 100 // The observers of the object.
99 base::ObserverList<Observer> observers_; 101 base::ObserverList<Observer> observers_;
100 102
101 // Views created in the class will be part of tree of |this|, so these 103 // Views created in the class will be part of tree of |this|, so these
102 // child views will be deleted when |this| is deleted. 104 // child views will be deleted when |this| is deleted.
103 InformationTextArea* auxiliary_text_; 105 InformationTextArea* auxiliary_text_;
104 InformationTextArea* preedit_; 106 InformationTextArea* preedit_;
105 views::View* candidate_area_; 107 views::View* candidate_area_;
106 108
107 // The candidate views are used for rendering candidates. 109 // The candidate views are used for rendering candidates.
108 std::vector<CandidateView*> candidate_views_; 110 std::vector<std::unique_ptr<CandidateView>> candidate_views_;
109 111
110 // Current columns size in |candidate_area_|. 112 // Current columns size in |candidate_area_|.
111 gfx::Size previous_shortcut_column_size_; 113 gfx::Size previous_shortcut_column_size_;
112 gfx::Size previous_candidate_column_size_; 114 gfx::Size previous_candidate_column_size_;
113 gfx::Size previous_annotation_column_size_; 115 gfx::Size previous_annotation_column_size_;
114 116
115 // The last cursor bounds. 117 // The last cursor bounds.
116 gfx::Rect cursor_bounds_; 118 gfx::Rect cursor_bounds_;
117 119
118 // The last compostion head bounds. 120 // The last composition head bounds.
119 gfx::Rect composition_head_bounds_; 121 gfx::Rect composition_head_bounds_;
120 122
121 // True if the candidate window should be shown with aligning with composition 123 // True if the candidate window should be shown with aligning with composition
122 // text as opposed to the cursor. 124 // text as opposed to the cursor.
123 bool should_show_at_composition_head_; 125 bool should_show_at_composition_head_;
124 126
125 // True if the candidate window should be shonw on the upper side of 127 // True if the candidate window should be shown on the upper side of
126 // composition text. 128 // composition text.
127 bool should_show_upper_side_; 129 bool should_show_upper_side_;
128 130
129 // True if the candidate window was open. This is used to determine when to 131 // True if the candidate window was open. This is used to determine when to
130 // send OnCandidateWindowOpened and OnCandidateWindowClosed events. 132 // send OnCandidateWindowOpened and OnCandidateWindowClosed events.
131 bool was_candidate_window_open_; 133 bool was_candidate_window_open_;
132 134
133 DISALLOW_COPY_AND_ASSIGN(CandidateWindowView); 135 DISALLOW_COPY_AND_ASSIGN(CandidateWindowView);
134 }; 136 };
135 137
136 } // namespace ime 138 } // namespace ime
137 } // namespace ui 139 } // namespace ui
138 140
139 #endif // UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_ 141 #endif // UI_CHROMEOS_IME_CANDIDATE_WINDOW_VIEW_H_
OLDNEW
« no previous file with comments | « no previous file | ui/chromeos/ime/candidate_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698