Index: ash/system/ime/tray_ime.cc |
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc |
index 7d61e88326ff5f61f5fcf61d57db3d520de7c4c4..c109ab221c79a8dfa0a880dd60498b48be30e0f5 100644 |
--- a/ash/system/ime/tray_ime.cc |
+++ b/ash/system/ime/tray_ime.cc |
@@ -13,6 +13,7 @@ |
#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" |
@@ -169,8 +170,7 @@ class IMEDetailedView : public TrayDetailsView, |
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(¤t); |
@@ -202,18 +202,16 @@ class IMENotificationView : public TrayNotificationView { |
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_; |