(Chrome OS) Notify when the candidate window is opened/closed.

chrome/browser/chromeos/input_method/candidate_window.cc

Index: chrome/browser/chromeos/input_method/candidate_window.cc
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index e8a4593f220821b67b4830f1dc388de1c26fd88e..f8589d96cd2773303d7f8b689df46dd59ca32a27 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -602,11 +602,16 @@ class CandidateWindowController::Impl : public CandidateWindowView::Observer,
   // Initializes the candidate window. Returns true on success.
   bool Init();
 
+  void AddObserver(CandidateWindowController::Observer* observer);
+  void RemoveObserver(CandidateWindowController::Observer* observer);
+
  private:
   // CandidateWindowView::Observer implementation.
   virtual void OnCandidateCommitted(int index,
                                     int button,
                                     int flags);
+  virtual void OnCandidateWindowOpened();
+  virtual void OnCandidateWindowClosed();
 
   // Creates the candidate window view.
   void CreateView();
@@ -640,6 +645,8 @@ class CandidateWindowController::Impl : public CandidateWindowView::Observer,
   // own |infolist_window_|.
   scoped_ptr<views::Widget> infolist_frame_;
 
+  ObserverList<CandidateWindowController::Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(Impl);
 };
 
@@ -879,15 +886,23 @@ void CandidateWindowView::Init() {
 }
 
 void CandidateWindowView::HideAll() {
+  bool was_visible = IsCandidateWindowOpen();
   parent_frame_->Hide();
+  if (was_visible) {
+    FOR_EACH_OBSERVER(Observer, observers_, OnCandidateWindowClosed());
+  }
 }
 
 void CandidateWindowView::HideLookupTable() {
+  bool was_visible = IsCandidateWindowOpen();
   candidate_area_->Hide();
   if (preedit_area_->IsShown())
     ResizeAndMoveParentFrame();
   else
     parent_frame_->Hide();
+  if (was_visible) {
+    FOR_EACH_OBSERVER(Observer, observers_, OnCandidateWindowClosed());
+  }
 }
 
 InformationTextArea* CandidateWindowView::GetAuxiliaryTextArea() {
@@ -928,9 +943,13 @@ void CandidateWindowView::UpdatePreeditText(const std::string& utf8_text) {
 }
 
 void CandidateWindowView::ShowLookupTable() {
+  bool was_visible = IsCandidateWindowOpen();
   candidate_area_->Show();
   ResizeAndMoveParentFrame();
   parent_frame_->Show();
+  if (!was_visible) {
+    FOR_EACH_OBSERVER(Observer, observers_, OnCandidateWindowOpened());
+  }
 }
 
 bool CandidateWindowView::ShouldUpdateCandidateViews(
@@ -1168,6 +1187,10 @@ void CandidateWindowView::MaybeInitializeCandidateViews(
   layout->Layout(candidate_area_contents);
 }
 
+bool CandidateWindowView::IsCandidateWindowOpen() const {
+  return candidate_area_->IsVisible() && candidate_area_->IsShown();
+}
+
 void CandidateWindowView::SelectCandidateAt(int index_in_page) {
   const int current_page_index = ComputePageIndex(lookup_table_);
   if (current_page_index < 0) {
@@ -1709,6 +1732,26 @@ void CandidateWindowController::Impl::OnCandidateCommitted(int index,
   ibus_ui_controller_->NotifyCandidateClicked(index, button, flags);
 }
 
+void CandidateWindowController::Impl::OnCandidateWindowOpened() {
+  FOR_EACH_OBSERVER(CandidateWindowController::Observer, observers_,
+                    CandidateWindowOpened());
+}
+
+void CandidateWindowController::Impl::OnCandidateWindowClosed() {
+  FOR_EACH_OBSERVER(CandidateWindowController::Observer, observers_,
+                    CandidateWindowClosed());
+}
+
+void CandidateWindowController::Impl::AddObserver(
+    CandidateWindowController::Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void CandidateWindowController::Impl::RemoveObserver(
+    CandidateWindowController::Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 void CandidateWindowController::Impl::OnConnectionChange(bool connected) {
   if (!connected) {
     candidate_window_->HideAll();
@@ -1728,5 +1771,15 @@ bool CandidateWindowController::Init() {
   return impl_->Init();
 }
 
+void CandidateWindowController::AddObserver(
+    CandidateWindowController::Observer* observer) {
+  impl_->AddObserver(observer);
+}
+
+void CandidateWindowController::RemoveObserver(
+    CandidateWindowController::Observer* observer) {
+  impl_->RemoveObserver(observer);
+}
+
 }  // namespace input_method
 }  // namespace chromeos