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

Unified Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

Issue 121163003: Cleanup CandidateWindowView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
index 5ffae3c303a5dfdf6e7d33d441fec242ddf77fb6..df98ba5b3087b592d90fbe6285f88135f25035c3 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -67,8 +67,6 @@ class CandidateWindowControllerImpl
private:
// CandidateWindowView::Observer implementation.
virtual void OnCandidateCommitted(int index) OVERRIDE;
- virtual void OnCandidateWindowOpened() OVERRIDE;
- virtual void OnCandidateWindowClosed() OVERRIDE;
// views::WidgetObserver implementation.
virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
@@ -87,6 +85,8 @@ class CandidateWindowControllerImpl
// Creates the candidate window view.
void CreateView();
+ void InitCandidateWindowView();
+
// Updates infolist bounds, if current bounds is up-to-date, this function
// does nothing.
gfx::Rect GetInfolistBounds();
@@ -94,13 +94,12 @@ class CandidateWindowControllerImpl
// The candidate window view.
CandidateWindowView* candidate_window_view_;
- // This is the outer frame of the candidate window view. The frame will
- // own |candidate_window_|.
- scoped_ptr<views::Widget> frame_;
-
// This is the outer frame of the infolist window view. Owned by the widget.
InfolistWindow* infolist_window_;
+ gfx::Rect cursor_bounds_;
+ gfx::Rect composition_head_;
+
// This is the controller of the IME mode indicator.
scoped_ptr<ModeIndicatorController> mode_indicator_controller_;

Powered by Google App Engine
This is Rietveld 408576698