Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / system_tray_delegate.h

diff --git a/src/ash/system/tray/system_tray_delegate.h b/src/ash/system/tray/system_tray_delegate.h
index de86112..4df2f70 100644 (file)
--- a/src/ash/system/tray/system_tray_delegate.h
+++ b/src/ash/system/tray/system_tray_delegate.h
@@ -15,7 +15,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class TimeDelta;
@@ -119,6 +118,9 @@ class ASH_EXPORT SystemTrayDelegate {
   // Returns the notification for supervised users.
   virtual const base::string16 GetSupervisedUserMessage() const = 0;
 
+  // Returns true if the current user is supervised.
+  virtual bool IsUserSupervised() const = 0;
+
   // Returns whether a system upgrade is available.
   virtual bool SystemShouldUpgrade() const = 0;
 
@@ -232,16 +234,11 @@ class ASH_EXPORT SystemTrayDelegate {
 
   // Shows UI to configure or activate the network specified by |network_id|,
   // which may include showing Payment or Portal UI when appropriate.
-  // |parent_window| is used to parent any configuration UI. If NULL a default
-  // window will be used.
-  virtual void ShowNetworkConfigure(const std::string& network_id,
-                                    gfx::NativeWindow parent_window) = 0;
+  virtual void ShowNetworkConfigure(const std::string& network_id) = 0;
 
   // Shows UI to enroll the network specified by |network_id| if appropriate
-  // and returns true, otherwise returns false. |parent_window| is used
-  // to parent any configuration UI. If NULL a default window will be used.
-  virtual bool EnrollNetwork(const std::string& network_id,
-                             gfx::NativeWindow parent_window) = 0;
+  // and returns true, otherwise returns false.
+  virtual bool EnrollNetwork(const std::string& network_id) = 0;
 
   // Shows UI to manage bluetooth devices.
   virtual void ManageBluetoothDevices() = 0;