Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/chromium/ash/system/status_area_widget.h b/chromium/ash/system/status_area_widget.h
index 6a4cb2a40aa..5283535f5a0 100644
--- a/chromium/ash/system/status_area_widget.h
+++ b/chromium/ash/system/status_area_widget.h
@@ -18,7 +18,6 @@ class WebNotificationTray;
 
 namespace internal {
 
-class LogoutButtonTray;
 class StatusAreaWidgetDelegate;
 
 class ASH_EXPORT StatusAreaWidget : public views::Widget {
@@ -28,7 +27,7 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
   explicit StatusAreaWidget(aura::Window* status_container);
   virtual ~StatusAreaWidget();
 
-  // Creates the SystemTray, WebNotificationTray and LogoutButtonTray.
+  // Creates the SystemTray and the WebNotificationTray.
   void CreateTrayViews();
 
   // Destroys the system tray and web notification tray. Called before
@@ -73,13 +72,11 @@ class ASH_EXPORT StatusAreaWidget : public views::Widget {
  private:
   void AddSystemTray();
   void AddWebNotificationTray();
-  void AddLogoutButtonTray();
 
   // Weak pointers to View classes that are parented to StatusAreaWidget:
   internal::StatusAreaWidgetDelegate* status_area_widget_delegate_;
   SystemTray* system_tray_;
   WebNotificationTray* web_notification_tray_;
-  LogoutButtonTray* logout_button_tray_;
   user::LoginStatus login_status_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaWidget);