Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / system_tray_delegate_chromeos.h

diff --git a/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index 6aafa9a..f42e8a9 100644 (file)
--- a/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
-#include "apps/app_window_registry.h"
 #include "ash/ime/input_method_menu_manager.h"
 #include "ash/session/session_state_observer.h"
 #include "ash/system/tray/system_tray.h"
@@ -30,6 +29,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 
 namespace chromeos {
 
@@ -45,7 +45,7 @@ class SystemTrayDelegateChromeOS
       public policy::CloudPolicyStore::Observer,
       public ash::SessionStateObserver,
       public chrome::BrowserListObserver,
-      public apps::AppWindowRegistry::Observer {
+      public extensions::AppWindowRegistry::Observer {
  public:
   SystemTrayDelegateChromeOS();
 
@@ -65,6 +65,7 @@ class SystemTrayDelegateChromeOS
   virtual const std::string GetSupervisedUserManager() const OVERRIDE;
   virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;
   virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;
+  virtual bool IsUserSupervised() const OVERRIDE;
   virtual bool SystemShouldUpgrade() const OVERRIDE;
   virtual base::HourClockType GetHourClockType() const OVERRIDE;
   virtual void ShowSettings() OVERRIDE;
@@ -102,10 +103,8 @@ class SystemTrayDelegateChromeOS
   virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) OVERRIDE;
   virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
   virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
-  virtual void ShowNetworkConfigure(const std::string& network_id,
-                                    gfx::NativeWindow parent_window) OVERRIDE;
-  virtual bool EnrollNetwork(const std::string& network_id,
-                             gfx::NativeWindow parent_window) OVERRIDE;
+  virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
+  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
   virtual void ManageBluetoothDevices() OVERRIDE;
   virtual void ToggleBluetooth() OVERRIDE;
   virtual void ShowMobileSimDialog() OVERRIDE;
@@ -229,13 +228,12 @@ class SystemTrayDelegateChromeOS
   // Overridden from chrome::BrowserListObserver:
   virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
 
-  // Overridden from apps::AppWindowRegistry::Observer:
-  virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
+  // Overridden from extensions::AppWindowRegistry::Observer:
+  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
 
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
-  base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
   scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
@@ -258,6 +256,8 @@ class SystemTrayDelegateChromeOS
   base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
       accounts_delegates_;
 
+  base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };