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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iwyu fixes Created 4 years, 8 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 // input_method::InputMethodEngineBase: 134 // input_method::InputMethodEngineBase:
135 void UpdateComposition(const ui::CompositionText& composition_text, 135 void UpdateComposition(const ui::CompositionText& composition_text,
136 uint32_t cursor_pos, 136 uint32_t cursor_pos,
137 bool is_visible) override; 137 bool is_visible) override;
138 void CommitTextToInputContext(int context_id, 138 void CommitTextToInputContext(int context_id,
139 const std::string& text) override; 139 const std::string& text) override;
140 bool SendKeyEvent(ui::KeyEvent* event, const std::string& code) override; 140 bool SendKeyEvent(ui::KeyEvent* event, const std::string& code) override;
141 141
142 // The current candidate window. 142 // The current candidate window.
143 scoped_ptr<ui::CandidateWindow> candidate_window_; 143 std::unique_ptr<ui::CandidateWindow> candidate_window_;
144 144
145 // The current candidate window property. 145 // The current candidate window property.
146 CandidateWindowProperty candidate_window_property_; 146 CandidateWindowProperty candidate_window_property_;
147 147
148 // Indicates whether the candidate window is visible. 148 // Indicates whether the candidate window is visible.
149 bool window_visible_; 149 bool window_visible_;
150 150
151 // Mapping of candidate index to candidate id. 151 // Mapping of candidate index to candidate id.
152 std::vector<int> candidate_ids_; 152 std::vector<int> candidate_ids_;
153 153
154 // Mapping of candidate id to index. 154 // Mapping of candidate id to index.
155 std::map<int, int> candidate_indexes_; 155 std::map<int, int> candidate_indexes_;
156 }; 156 };
157 157
158 } // namespace chromeos 158 } // namespace chromeos
159 159
160 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_ 160 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_ENGINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698