| Index: ash/system/ime/tray_ime.cc
|
| diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
|
| index 5fd468758aefe4b75431e2772e6ea1b176dd26f3..f4c35536a47401cc1acfb05b34656a79e07b6acf 100644
|
| --- a/ash/system/ime/tray_ime.cc
|
| +++ b/ash/system/ime/tray_ime.cc
|
| @@ -20,7 +20,6 @@
|
| #include "ash/system/tray/tray_notification_view.h"
|
| #include "ash/system/tray/tray_utils.h"
|
| #include "base/logging.h"
|
| -#include "base/timer.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "grit/ash_resources.h"
|
| #include "grit/ash_strings.h"
|
| @@ -181,35 +180,12 @@ class IMENotificationView : public TrayNotificationView {
|
| UpdateView(GetLabel());
|
| }
|
|
|
| - void StartAutoCloseTimer(int seconds) {
|
| - autoclose_.Stop();
|
| - autoclose_delay_ = seconds;
|
| - if (autoclose_delay_) {
|
| - autoclose_.Start(FROM_HERE,
|
| - base::TimeDelta::FromSeconds(autoclose_delay_),
|
| - this, &IMENotificationView::Close);
|
| - }
|
| - }
|
| -
|
| - void StopAutoCloseTimer() {
|
| - autoclose_.Stop();
|
| - }
|
| -
|
| - void RestartAutoCloseTimer() {
|
| - if (autoclose_delay_)
|
| - StartAutoCloseTimer(autoclose_delay_);
|
| - }
|
| -
|
| // Overridden from TrayNotificationView.
|
| virtual void OnClickAction() OVERRIDE {
|
| owner()->PopupDetailedView(0, true);
|
| }
|
|
|
| private:
|
| - void Close() {
|
| - owner()->HideNotificationView();
|
| - }
|
| -
|
| views::Label* GetLabel() {
|
| SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
|
| IMEInfo current;
|
| @@ -226,10 +202,6 @@ class IMENotificationView : public TrayNotificationView {
|
| return label;
|
| }
|
|
|
| -
|
| - int autoclose_delay_;
|
| - base::OneShotTimer<IMENotificationView> autoclose_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(IMENotificationView);
|
| };
|
|
|
|
|