Cleanup CandidateWindowView.

chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
 
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 49 matching lines @@
   // |has_highlighted| to true if infolist_entries contains highlighted entry.
   // TODO(mukai): move this method (and tests) to the new InfolistEntry model.
   static void ConvertLookupTableToInfolistEntry(
       const CandidateWindow& candidate_window,
       std::vector<InfolistEntry>* infolist_entries,
       bool* has_highlighted);
 
  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;
 
   // IBusPanelCandidateWindowHandlerInterface implementation.
   virtual void SetCursorBounds(const gfx::Rect& cursor_bounds,
                                const gfx::Rect& composition_head) OVERRIDE;
   virtual void UpdateAuxiliaryText(const std::string& utf8_text,
                                    bool visible) OVERRIDE;
   virtual void UpdateLookupTable(const CandidateWindow& candidate_window,
                                  bool visible) OVERRIDE;
   virtual void UpdatePreeditText(const std::string& utf8_text,
                                  unsigned int cursor, bool visible) OVERRIDE;
   virtual void FocusStateChanged(bool is_focused) OVERRIDE;
 
   // 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();
 
   // 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_;
 
   // The infolist entries and its focused index which currently shown in
   // Infolist window.
   std::vector<InfolistEntry> latest_infolist_entries_;
 
   ObserverList<CandidateWindowController::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
 
 }  // namespace input_method
 }  // namespace chromeos