Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2897)

Unified Diff: ash/system/ime/tray_ime.cc

Issue 16046007: Shows the display info as a popup when a new display is connected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: PopupDetailedView -> ShowNotificationView Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698