| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| index 9ac78405ad2f5b8083346b689229034c196988d9..b43d5fcdabceaa6afde000ae4afd690e55d4cf1a 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -52,6 +52,7 @@
|
| #include "chrome/browser/chromeos/system_key_event_listener.h"
|
| #include "chrome/browser/google_apis/drive_service_interface.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| +#include "chrome/browser/policy/browser_policy_connector.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
|
| @@ -289,6 +290,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| return ash::user::LOGGED_IN_USER;
|
| }
|
|
|
| + virtual const std::string GetEnterpriseDomain() const OVERRIDE {
|
| + return g_browser_process->browser_policy_connector()->GetEnterpriseDomain();
|
| + }
|
| +
|
| virtual bool SystemShouldUpgrade() const OVERRIDE {
|
| return UpgradeDetector::GetInstance()->notify_upgrade();
|
| }
|
| @@ -352,6 +357,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| chrome::ShowHelp(GetAppropriateBrowser(), chrome::HELP_SOURCE_MENU);
|
| }
|
|
|
| + virtual void ShowPublicAccountInfo() OVERRIDE {
|
| + chrome::ShowPolicy(GetAppropriateBrowser());
|
| + }
|
| +
|
| virtual void ShutDown() OVERRIDE {
|
| DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
|
| if (!base::chromeos::IsRunningOnChromeOS())
|
|
|