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

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.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: rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
7 7
8 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 11 #include "base/observer_list.h"
12 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
13 #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h" 13 #include "ui/base/ime/chromeos/ime_candidate_window_handler_interface.h"
14 #include "ui/base/ime/infolist_entry.h" 14 #include "ui/base/ime/infolist_entry.h"
15 #include "ui/chromeos/ime/candidate_window_view.h" 15 #include "ui/chromeos/ime/candidate_window_view.h"
16 #include "ui/views/widget/widget_observer.h" 16 #include "ui/views/widget/widget_observer.h"
17 17
18 namespace ui { 18 namespace ui {
19 class CandidateWindow; 19 class CandidateWindow;
20 20
21 namespace ime { 21 namespace ime {
22 class InfolistWindow; 22 class InfolistWindow;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // The candidate window view. 77 // The candidate window view.
78 ui::ime::CandidateWindowView* candidate_window_view_; 78 ui::ime::CandidateWindowView* candidate_window_view_;
79 79
80 // This is the outer frame of the infolist window view. Owned by the widget. 80 // This is the outer frame of the infolist window view. Owned by the widget.
81 ui::ime::InfolistWindow* infolist_window_; 81 ui::ime::InfolistWindow* infolist_window_;
82 82
83 gfx::Rect cursor_bounds_; 83 gfx::Rect cursor_bounds_;
84 gfx::Rect composition_head_; 84 gfx::Rect composition_head_;
85 85
86 // This is the controller of the IME mode indicator. 86 // This is the controller of the IME mode indicator.
87 scoped_ptr<ModeIndicatorController> mode_indicator_controller_; 87 std::unique_ptr<ModeIndicatorController> mode_indicator_controller_;
88 88
89 // The infolist entries and its focused index which currently shown in 89 // The infolist entries and its focused index which currently shown in
90 // Infolist window. 90 // Infolist window.
91 std::vector<ui::InfolistEntry> latest_infolist_entries_; 91 std::vector<ui::InfolistEntry> latest_infolist_entries_;
92 92
93 base::ObserverList<CandidateWindowController::Observer> observers_; 93 base::ObserverList<CandidateWindowController::Observer> observers_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl); 95 DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl);
96 }; 96 };
97 97
98 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL _H_ 98 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL _H_
99 99
100 } // namespace input_method 100 } // namespace input_method
101 } // namespace chromeos 101 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/first_run/step.cc ('k') | chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698