Revert 174161

> Implemented tray notifications for enterprise enrolled devices.
> 
> 
> BUG=chromium-os:35755
> TBR=ben
> 
> Review URL: https://chromiumcodereview.appspot.com/11594009

http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASAN%20Builder/builds/2567/steps/compile/logs/stdio

In file included from ../../ash/system/tray/system_tray_delegate.cc:7:
../../ash/system/tray/test_system_tray_delegate.h:33:17: error: [chromium-style] Overriding method must be marked with OVERRIDE.
  virtual const string16 GetEnterpriseMessage() const;

In file included from ../../ash/system/tray/test_system_tray_delegate.cc:5:
../../ash/system/tray/test_system_tray_delegate.h:33:17: error: [chromium-style] Overriding method must be marked with OVERRIDE.
  virtual const string16 GetEnterpriseMessage() const;

TBR=dzhioev@chromium.org
Review URL: https://codereview.chromium.org/11639044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174163 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 22 insertions, 262 deletions

diff --git a/ash/ash.gyp b/ash/ash.gyp
index a42051b..66e9404 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -166,9 +166,6 @@
         'system/brightness/brightness_control_delegate.h',
         'system/brightness/tray_brightness.cc',
         'system/brightness/tray_brightness.h',
-        'system/chromeos/enterprise/enterprise_domain_observer.h',
-        'system/chromeos/enterprise/tray_enterprise.h',
-        'system/chromeos/enterprise/tray_enterprise.cc',
         'system/chromeos/keyboard_brightness_controller.cc',
         'system/chromeos/keyboard_brightness_controller.h',
         'system/chromeos/network/network_detailed_view.h',
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 60a0156..aa9ea59 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -160,30 +160,28 @@
 
       <!-- ChromeOS specific icons -->
       <if expr="pp_ifdef('chromeos')">
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_LIGHT" file="cros/status_managed_tray.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_DARK" file="cros/status_managed_p.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_DARK" file="cros/network/statusbar_network_4g_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT" file="cros/network/statusbar_network_4g_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_DARK" file="cros/network/statusbar_network_bars_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT" file="cros/network/statusbar_network_bars_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK" file="cros/network/statusbar_network_edge_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT" file="cros/network/statusbar_network_edge_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS" file="cros/network/statusbar_network_gprs.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA" file="cros/network/statusbar_network_hspa.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS" file="cros/network/statusbar_network_hspa_plus.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE" file="cros/network/statusbar_network_lte.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED" file="cros/network/statusbar_network_lte_advanced.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN" file="cros/network/statusbar_vpn_dark.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" />
-        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_WIRED" file="cros/network/statusbar_wired.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_DARK" file="cros/network/statusbar_network_4g_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT" file="cros/network/statusbar_network_4g_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_DARK" file="cros/network/statusbar_network_bars_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT" file="cros/network/statusbar_network_bars_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK" file="cros/network/statusbar_network_edge_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT" file="cros/network/statusbar_network_edge_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS" file="cros/network/statusbar_network_gprs.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA" file="cros/network/statusbar_network_hspa.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS" file="cros/network/statusbar_network_hspa_plus.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE" file="cros/network/statusbar_network_lte.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED" file="cros/network/statusbar_network_lte_advanced.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN" file="cros/network/statusbar_vpn_dark.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" />
+	<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_WIRED" file="cros/network/statusbar_wired.png" />
       </if>
 
       <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" file="common/status_update.png" />
diff --git a/ash/system/chromeos/enterprise/enterprise_domain_observer.h b/ash/system/chromeos/enterprise/enterprise_domain_observer.h
deleted file mode 100644
index 5df8a42..0000000
--- a/ash/system/chromeos/enterprise/enterprise_domain_observer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSTEM_CHROMEOS_ENTERPISE_ENTERPRISE_DOMAIN_OBSERVER_H_
-#define ASH_SYSTEM_CHROMEOS_ENTERPISE_ENTERPRISE_DOMAIN_OBSERVER_H_
-
-namespace ash {
-
-class EnterpriseDomainObserver {
- public:
-  virtual ~EnterpriseDomainObserver() {}
-
-  virtual void OnEnterpriseDomainChanged() = 0;
-};
-
-}  // namespace ash
-
-#endif  // ASH_SYSTEM_CHROMEOS_ENTERPISE_ENTERPRISE_DOMAIN_OBSERVER_H_
-
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.cc b/ash/system/chromeos/enterprise/tray_enterprise.cc
deleted file mode 100644
index 244c327..0000000
--- a/ash/system/chromeos/enterprise/tray_enterprise.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/system/chromeos/enterprise/tray_enterprise.h"
-
-#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/system/tray/tray_constants.h"
-#include "ash/system/tray/tray_views.h"
-#include "grit/ash_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/font.h"
-#include "ui/views/layout/fill_layout.h"
-
-namespace ash {
-namespace internal {
-
-class EnterpriseDefaultView : public views::View {
- public:
-  explicit EnterpriseDefaultView(ViewClickListener* click_listener);
-  virtual ~EnterpriseDefaultView();
-  void SetMessage(const string16& message);
- private:
-  views::View* CreateChildView(const string16& message) const;
-
-  ViewClickListener* click_listener_;
-  string16 message_;
-
-  DISALLOW_COPY_AND_ASSIGN(EnterpriseDefaultView);
-};
-
-EnterpriseDefaultView::EnterpriseDefaultView(
-    ViewClickListener* click_listener)
-    : click_listener_(click_listener) {
-  SetLayoutManager(new views::FillLayout());
-  SetVisible(false);
-}
-
-EnterpriseDefaultView::~EnterpriseDefaultView() {
-}
-
-void EnterpriseDefaultView::SetMessage(const string16& message) {
-  if (message_ == message)
-    return;
-
-  message_ = message;
-  RemoveAllChildViews(true);
-  if (!message_.empty()) {
-    AddChildView(CreateChildView(message_));
-    SetVisible(true);
-  } else {
-    SetVisible(false);
-  }
-}
-
-views::View* EnterpriseDefaultView::CreateChildView(
-    const string16& message) const {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  const gfx::ImageSkia* icon =
-      rb.GetImageSkiaNamed(IDR_AURA_UBER_TRAY_ENTERPRISE_DARK);
-  HoverHighlightView* child = new HoverHighlightView(click_listener_);
-  child->AddIconAndLabel(*icon, message, gfx::Font::NORMAL);
-  child->text_label()->SetElideBehavior(views::Label::ELIDE_AT_END);
-  child->text_label()->SetFont(rb.GetFont(ui::ResourceBundle::SmallFont));
-  child->set_fixed_height(kTrayPopupItemHeight);
-  child->set_border(views::Border::CreateEmptyBorder(0,
-      kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));
-  child->SetVisible(true);
-  return child;
-}
-
-TrayEnterprise::TrayEnterprise(SystemTray* system_tray)
-    : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_ENTERPRISE_LIGHT) {
-  Shell::GetInstance()->system_tray_notifier()->
-      AddEnterpriseDomainObserver(this);
-}
-
-TrayEnterprise::~TrayEnterprise() {
-  Shell::GetInstance()->system_tray_notifier()->
-      RemoveEnterpriseDomainObserver(this);
-}
-
-void TrayEnterprise::UpdateEnterpriseMessage() {
-  string16 message = Shell::GetInstance()->system_tray_delegate()->
-      GetEnterpriseMessage();
-  if (default_view_)
-    default_view_->SetMessage(message);
-}
-
-views::View* TrayEnterprise::CreateDefaultView(user::LoginStatus /*status*/) {
-  default_view_ = new EnterpriseDefaultView(this);
-  UpdateEnterpriseMessage();
-  return default_view_;
-}
-
-void TrayEnterprise::DestroyDefaultView() {
-  default_view_ = NULL;
-}
-
-bool TrayEnterprise::GetInitialVisibility() {
-  return !Shell::GetInstance()->system_tray_delegate()->
-      GetEnterpriseMessage().empty();
-}
-
-void TrayEnterprise::OnEnterpriseDomainChanged() {
-  UpdateEnterpriseMessage();
-  if (tray_view())
-    tray_view()->SetVisible(GetInitialVisibility());
-}
-
-void TrayEnterprise::ClickedOn(views::View* sender) {
-  Shell::GetInstance()->system_tray_delegate()->ShowEnterpriseInfo();
-}
-
-} // namespace internal
-} // namespace ash
-
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.h b/ash/system/chromeos/enterprise/tray_enterprise.h
deleted file mode 100644
index 66e3449..0000000
--- a/ash/system/chromeos/enterprise/tray_enterprise.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
-#define ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
-
-#include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
-#include "ash/system/tray/tray_image_item.h"
-#include "ash/system/tray/tray_views.h"
-
-namespace ash {
-class SystemTray;
-}
-
-namespace ash {
-namespace internal {
-
-class EnterpriseDefaultView;
-
-class TrayEnterprise : public TrayImageItem,
-                       public ViewClickListener,
-                       public EnterpriseDomainObserver {
- public:
-  explicit TrayEnterprise(SystemTray* system_tray);
-  virtual ~TrayEnterprise();
-
-  // If message is not empty updates content of default view, otherwise hides
-  // tray items.
-  void UpdateEnterpriseMessage();
-
-  // Overridden from TrayImageItem.
-  virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
-  virtual void DestroyDefaultView() OVERRIDE;
-  virtual bool GetInitialVisibility() OVERRIDE;
-
-  // Overridden from EnterpriseDomainObserver.
-  virtual void OnEnterpriseDomainChanged() OVERRIDE;
-
-  // Overridden from ViewClickListener.
-  virtual void ClickedOn(views::View* sender) OVERRIDE;
-
- private:
-  EnterpriseDefaultView* default_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(TrayEnterprise);
-};
-
-} // namespace internal
-} // namespace ash
-
-#endif  // ASH_SYSTEM_CHROMEOS_ENTERPRISE_TRAY_ENTERPRISE_H
-
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index d166d9a..66578c7 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -52,7 +52,6 @@
 #include "ui/views/view.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/system/chromeos/enterprise/tray_enterprise.h"
 #include "ash/system/chromeos/network/tray_network.h"
 #include "ash/system/chromeos/network/tray_sms.h"
 #include "ash/system/chromeos/network/tray_vpn.h"
@@ -133,9 +132,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   AddTrayItem(new internal::TraySessionLengthLimit(this));
   AddTrayItem(new internal::TrayLogoutButton(this));
   AddTrayItem(new internal::TrayUser(this));
-#if defined(OS_CHROMEOS)
-  AddTrayItem(new internal::TrayEnterprise(this));
-#endif
   AddTrayItem(new internal::TrayIME(this));
   tray_accessibility_ = new internal::TrayAccessibility(this);
   AddTrayItem(tray_accessibility_);
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index acfa046..762ff24 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -121,9 +121,6 @@ class SystemTrayDelegate {
   // Returns the domain that manages the device, if it is enterprise-enrolled.
   virtual const std::string GetEnterpriseDomain() const = 0;
 
-  // Returns notification for enterprise enrolled devices.
-  virtual const string16 GetEnterpriseMessage() const = 0;
-
   // Returns whether a system upgrade is available.
   virtual bool SystemShouldUpgrade() const = 0;
 
@@ -166,9 +163,6 @@ class SystemTrayDelegate {
   // Shows more information about public account mode.
   virtual void ShowPublicAccountInfo() = 0;
 
-  // Shows information about enterprise enrolled devices.
-  virtual void ShowEnterpriseInfo() = 0;
-
   // Attempts to shut down the system.
   virtual void ShutDown() = 0;
 
diff --git a/ash/system/tray/system_tray_notifier.cc b/ash/system/tray/system_tray_notifier.cc
index 8897917..77af895 100644
--- a/ash/system/tray/system_tray_notifier.cc
+++ b/ash/system/tray/system_tray_notifier.cc
@@ -157,17 +157,6 @@ void SystemTrayNotifier::AddSmsObserver(SmsObserver* observer) {
 void SystemTrayNotifier::RemoveSmsObserver(SmsObserver* observer) {
   sms_observers_.RemoveObserver(observer);
 }
-
-void SystemTrayNotifier::AddEnterpriseDomainObserver(
-    EnterpriseDomainObserver* observer) {
-  enterprise_domain_observers_.AddObserver(observer);
-}
-
-void SystemTrayNotifier::RemoveEnterpriseDomainObserver(
-    EnterpriseDomainObserver* observer) {
-  enterprise_domain_observers_.RemoveObserver(observer);
-}
-
 #endif
 
 void SystemTrayNotifier::NotifyAccessibilityModeChanged(
@@ -341,11 +330,6 @@ void SystemTrayNotifier::NotifyAddSmsMessage(
   FOR_EACH_OBSERVER(SmsObserver, sms_observers_, AddMessage(message));
 }
 
-void SystemTrayNotifier::NotifyEnterpriseDomainChanged() {
-  FOR_EACH_OBSERVER(EnterpriseDomainObserver, enterprise_domain_observers_,
-      OnEnterpriseDomainChanged());
-}
-
 #endif  // OS_CHROMEOS
 
 }  // namespace ash
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
index 7437efc..6cc50f1 100644
--- a/ash/system/tray/system_tray_notifier.h
+++ b/ash/system/tray/system_tray_notifier.h
@@ -12,7 +12,6 @@
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
-#include "ash/system/chromeos/enterprise/enterprise_domain_observer.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/chromeos/network/sms_observer.h"
 #include "ash/system/date/clock_observer.h"
@@ -92,9 +91,6 @@ public:
 
   void AddSmsObserver(SmsObserver* observer);
   void RemoveSmsObserver(SmsObserver* observer);
-
-  void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
-  void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
 #endif
 
   void NotifyAccessibilityModeChanged(
@@ -131,7 +127,6 @@ public:
   void NotifyVpnRefreshNetwork(const NetworkIconInfo &info);
   void NotifyWillToggleWifi();
   void NotifyAddSmsMessage(const base::DictionaryValue& message);
-  void NotifyEnterpriseDomainChanged();
 #endif
 
  private:
@@ -153,7 +148,6 @@ public:
   ObserverList<NetworkObserver> network_observers_;
   ObserverList<NetworkObserver> vpn_observers_;
   ObserverList<SmsObserver> sms_observers_;
-  ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
diff --git a/ash/system/tray/test_system_tray_delegate.cc b/ash/system/tray/test_system_tray_delegate.cc
index e879d4c..56c09bb 100644
--- a/ash/system/tray/test_system_tray_delegate.cc
+++ b/ash/system/tray/test_system_tray_delegate.cc
@@ -98,10 +98,6 @@ const std::string TestSystemTrayDelegate::GetEnterpriseDomain() const {
   return std::string();
 }
 
-const string16 TestSystemTrayDelegate::GetEnterpriseMessage() const {
-  return string16();
-}
-
 bool TestSystemTrayDelegate::SystemShouldUpgrade() const {
   return true;
 }
@@ -147,9 +143,6 @@ void TestSystemTrayDelegate::ShowAccessibilityHelp() {
 void TestSystemTrayDelegate::ShowPublicAccountInfo() {
 }
 
-void TestSystemTrayDelegate::ShowEnterpriseInfo() {
-}
-
 void TestSystemTrayDelegate::ShutDown() {
   MessageLoop::current()->Quit();
 }
diff --git a/ash/system/tray/test_system_tray_delegate.h b/ash/system/tray/test_system_tray_delegate.h
index b342185..f5b85f4 100644
--- a/ash/system/tray/test_system_tray_delegate.h
+++ b/ash/system/tray/test_system_tray_delegate.h
@@ -30,7 +30,6 @@ class TestSystemTrayDelegate : public SystemTrayDelegate {
   virtual const gfx::ImageSkia& GetUserImage() const OVERRIDE;
   virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE;
   virtual const std::string GetEnterpriseDomain() const OVERRIDE;
-  virtual const string16 GetEnterpriseMessage() const;
   virtual bool SystemShouldUpgrade() const OVERRIDE;
   virtual base::HourClockType GetHourClockType() const OVERRIDE;
   virtual PowerSupplyStatus GetPowerSupplyStatus() const OVERRIDE;
@@ -45,7 +44,6 @@ class TestSystemTrayDelegate : public SystemTrayDelegate {
   virtual void ShowHelp() OVERRIDE;
   virtual void ShowAccessibilityHelp() OVERRIDE;
   virtual void ShowPublicAccountInfo() OVERRIDE;
-  virtual void ShowEnterpriseInfo() OVERRIDE;
   virtual void ShutDown() OVERRIDE;
   virtual void SignOut() OVERRIDE;
   virtual void RequestLockScreen() OVERRIDE;
diff --git a/ash/system/tray/tray_views.h b/ash/system/tray/tray_views.h
index f0b4f4f..6934cba 100644
--- a/ash/system/tray/tray_views.h
+++ b/ash/system/tray/tray_views.h
@@ -129,10 +129,6 @@ class HoverHighlightView : public ActionableView {
   void set_text_default_color(SkColor color) { text_default_color_ = color; }
   void set_fixed_height(int height) { fixed_height_ = height; }
 
-  views::Label* text_label() {
-    return text_label_;
-  }
-
  private:
   // Overridden from ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;