Upstream version 10.39.225.0

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

diff --git a/src/ash/system/tray/default_system_tray_delegate.cc b/src/ash/system/tray/default_system_tray_delegate.cc
index e2aeae3..fda4807 100644 (file)
--- a/src/ash/system/tray/default_system_tray_delegate.cc
+++ b/src/ash/system/tray/default_system_tray_delegate.cc
@@ -86,6 +86,10 @@ const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage()
   return base::string16();
 }
 
+bool DefaultSystemTrayDelegate::IsUserSupervised() const {
+  return false;
+}
+
 bool DefaultSystemTrayDelegate::SystemShouldUpgrade() const {
   return true;
 }
@@ -203,12 +207,10 @@ void DefaultSystemTrayDelegate::ActivateIMEProperty(const std::string& key) {
 }
 
 void DefaultSystemTrayDelegate::ShowNetworkConfigure(
-    const std::string& network_id,
-    gfx::NativeWindow parent_window) {
+    const std::string& network_id) {
 }
 
-bool DefaultSystemTrayDelegate::EnrollNetwork(const std::string& network_id,
-                                              gfx::NativeWindow parent_window) {
+bool DefaultSystemTrayDelegate::EnrollNetwork(const std::string& network_id) {
   return true;
 }