Index: chrome/browser/ui/views/message_center/web_notification_tray.h |
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray.h b/chrome/browser/ui/views/message_center/web_notification_tray.h |
index 34f0193be52f855e4d058ac4b5fbc146c84fa4d0..5f6426f0284f53b94521f4f2fb6f7996ef045abd 100644 |
--- a/chrome/browser/ui/views/message_center/web_notification_tray.h |
+++ b/chrome/browser/ui/views/message_center/web_notification_tray.h |
@@ -6,6 +6,7 @@ |
#define CHROME_BROWSER_UI_VIEWS_MESSAGE_CENTER_WEB_NOTIFICATION_TRAY_H_ |
#include "base/memory/weak_ptr.h" |
+#include "base/prefs/pref_member.h" |
#include "chrome/browser/status_icons/status_icon_menu_model.h" |
#include "chrome/browser/status_icons/status_icon_observer.h" |
#include "chrome/browser/ui/views/message_center/message_center_widget_delegate.h" |
@@ -17,6 +18,11 @@ |
#include "ui/message_center/message_center_tray_delegate.h" |
#include "ui/views/widget/widget_observer.h" |
+#if defined(OS_WIN) |
+#include "base/threading/thread.h" |
+#endif |
+ |
+class PrefService; |
class StatusIcon; |
namespace message_center { |
@@ -43,7 +49,7 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate, |
public base::SupportsWeakPtr<WebNotificationTray>, |
public StatusIconMenuModel::Delegate { |
public: |
- WebNotificationTray(); |
+ explicit WebNotificationTray(PrefService* local_state); |
virtual ~WebNotificationTray(); |
message_center::MessageCenter* message_center(); |
@@ -65,6 +71,8 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate, |
// This shows a platform-specific balloon informing the user of the existence |
// of the message center in the status tray area. |
void DisplayFirstRunBalloon(); |
+ |
+ void EnforceStatusIconVisible(); |
#endif |
// StatusIconMenuModel::Delegate implementation. |
@@ -95,6 +103,12 @@ class WebNotificationTray : public message_center::MessageCenterTrayDelegate, |
void AddQuietModeMenu(StatusIcon* status_icon); |
MessageCenterWidgetDelegate* GetMessageCenterWidgetDelegateForTest(); |
+#if defined(OS_WIN) |
+ void JoinWorkerThread(); |
+ BooleanPrefMember did_force_tray_visible_; |
sky
2014/03/19 22:26:39
nit: newline 107/108.
dewittj
2014/03/20 19:31:08
Done.
|
+ scoped_ptr<base::Thread> worker_thread_; |
+#endif |
+ |
MessageCenterWidgetDelegate* message_center_delegate_; |
scoped_ptr<message_center::MessagePopupCollection> popup_collection_; |