Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / system_tray_notifier.cc

diff --git a/src/ash/system/tray/system_tray_notifier.cc b/src/ash/system/tray/system_tray_notifier.cc
index 1a55f8a..81ed05f 100644 (file)
--- a/src/ash/system/tray/system_tray_notifier.cc
+++ b/src/ash/system/tray/system_tray_notifier.cc
@@ -4,16 +4,9 @@
 
 #include "ash/system/tray/system_tray_notifier.h"
 
-#if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/network/network_state_notifier.h"
-#endif
-
 namespace ash {
 
 SystemTrayNotifier::SystemTrayNotifier() {
-#if defined(OS_CHROMEOS)
-  network_state_notifier_.reset(new NetworkStateNotifier());
-#endif
 }
 
 SystemTrayNotifier::~SystemTrayNotifier() {
@@ -182,10 +175,20 @@ void SystemTrayNotifier::RemoveLastWindowClosedObserver(
     LastWindowClosedObserver* observer) {
   last_window_closed_observers_.RemoveObserver(observer);
 }
+
+void SystemTrayNotifier::AddVirtualKeyboardObserver(
+    VirtualKeyboardObserver* observer) {
+  virtual_keyboard_observers_.AddObserver(observer);
+}
+
+void SystemTrayNotifier::RemoveVirtualKeyboardObserver(
+    VirtualKeyboardObserver* observer) {
+  virtual_keyboard_observers_.RemoveObserver(observer);
+}
 #endif
 
 void SystemTrayNotifier::NotifyAccessibilityModeChanged(
-    AccessibilityNotificationVisibility notify) {
+    ui::AccessibilityNotificationVisibility notify) {
   FOR_EACH_OBSERVER(
       AccessibilityObserver,
       accessibility_observers_,
@@ -285,11 +288,9 @@ void SystemTrayNotifier::NotifyLocaleChanged(
       OnLocaleChanged(delegate, cur_locale, from_locale, to_locale));
 }
 
-void SystemTrayNotifier::NotifyUpdateRecommended(
-    UpdateObserver::UpdateSeverity severity) {
-  FOR_EACH_OBSERVER(UpdateObserver,
-                    update_observers_,
-                    OnUpdateRecommended(severity));
+void SystemTrayNotifier::NotifyUpdateRecommended(const UpdateInfo& info) {
+  FOR_EACH_OBSERVER(
+      UpdateObserver, update_observers_, OnUpdateRecommended(info));
 }
 
 void SystemTrayNotifier::NotifyUserUpdate() {
@@ -384,6 +385,13 @@ void SystemTrayNotifier::NotifyLastWindowClosed() {
                     OnLastWindowClosed());
 }
 
+void SystemTrayNotifier::NotifyVirtualKeyboardSuppressionChanged(
+    bool suppressed) {
+  FOR_EACH_OBSERVER(VirtualKeyboardObserver,
+                    virtual_keyboard_observers_,
+                    OnKeyboardSuppressionChanged(suppressed));
+}
+
 #endif  // OS_CHROMEOS
 
 }  // namespace ash