Handle gesture events in notifications.

ash/system/ime/tray_ime.cc

 // 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.
 
 #include "ash/system/ime/tray_ime.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_details_view.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
+#include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/logging.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
@@ skipping 136 matching lines @@
   std::map<views::View*, std::string> ime_map_;
   std::map<views::View*, std::string> property_map_;
   views::View* settings_;
 
   DISALLOW_COPY_AND_ASSIGN(IMEDetailedView);
 };
 
 class IMENotificationView : public TrayNotificationView {
  public:
   explicit IMENotificationView(TrayIME* tray)
-      : TrayNotificationView(IDR_AURA_UBER_TRAY_IME),
-        tray_(tray) {
+      : TrayNotificationView(tray, IDR_AURA_UBER_TRAY_IME) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     IMEInfo current;
     delegate->GetCurrentIME(&current);
 
     // TODO(zork): Use IDS_ASH_STATUS_TRAY_THIRD_PARTY_IME_TURNED_ON_BUBBLE for
     // third party IMEs
     InitView(new views::Label(
         l10n_util::GetStringFUTF16(
             IDS_ASH_STATUS_TRAY_IME_TURNED_ON_BUBBLE,
             current.short_name)));
@@ skipping 11 matching lines @@
 
   void StopAutoCloseTimer() {
     autoclose_.Stop();
   }
 
   void RestartAutoCloseTimer() {
     if (autoclose_delay_)
       StartAutoCloseTimer(autoclose_delay_);
   }
 
-  // Overridden from TrayNotificationView:
-  virtual void OnClose() OVERRIDE {
-    Close();
+  // Overridden from TrayNotificationView.
+  virtual void OnClickAction() OVERRIDE {
+    tray()->PopupDetailedView(0, true);
   }
 
  private:
   void Close() {
-    tray_->HideNotificationView();
+    tray()->HideNotificationView();
   }
 
-  TrayIME* tray_;
-
   int autoclose_delay_;
   base::OneShotTimer<IMENotificationView> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(IMENotificationView);
 };
 
 
 }  // namespace tray
 
 TrayIME::TrayIME()
@@ skipping 92 matching lines @@
   if (list.size() > 1 && show_message && !message_shown_) {
     if (!notification_) {
       ShowNotificationView();
       message_shown_ = true;
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash