Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / system_tray_delegate_win.cc

diff --git a/src/chrome/browser/ui/ash/system_tray_delegate_win.cc b/src/chrome/browser/ui/ash/system_tray_delegate_win.cc
index eef9cbe..47e7621 100644 (file)
--- a/src/chrome/browser/ui/ash/system_tray_delegate_win.cc
+++ b/src/chrome/browser/ui/ash/system_tray_delegate_win.cc
@@ -20,10 +20,9 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/grit/locale_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
-
-#include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -84,6 +83,10 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
     return base::string16();
   }
 
+  virtual bool IsUserSupervised() const OVERRIDE {
+    return false;
+  }
+
   virtual bool SystemShouldUpgrade() const OVERRIDE {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
@@ -207,12 +210,10 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
   virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
   }
 
-  virtual void ShowNetworkConfigure(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,
-                             gfx::NativeWindow parent_window) OVERRIDE {
+  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE {
     return true;
   }