Updates the display message in the uber tray.

ash/system/chromeos/tray_display.h

Index: ash/system/chromeos/tray_display.h
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h
index 0265704ea677b3eb92943838ed52459a8c594575..315fbbdcac3517955daab3724892a108b7b7b067 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -5,8 +5,12 @@
 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 
+#include <map>
+
 #include "ash/display/display_controller.h"
+#include "ash/display/display_info.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "base/string16.h"
 
 namespace views {
 class View;
@@ -15,13 +19,6 @@ class View;
 namespace ash {
 namespace internal {
 
-enum TrayDisplayMode {
-  TRAY_DISPLAY_SINGLE,
-  TRAY_DISPLAY_EXTENDED,
-  TRAY_DISPLAY_MIRRORED,
-  TRAY_DISPLAY_DOCKED,
-};
-
 class DisplayView;
 class DisplayNotificationView;
 
@@ -32,6 +29,10 @@ class TrayDisplay : public SystemTrayItem,
   virtual ~TrayDisplay();
 
  private:
+  // Checks the current display settings and determine what message should be
+  // shown for notification.
+  base::string16 GetDisplayMessageForNotification();
+
   // Overridden from SystemTrayItem.
   virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
   virtual views::View* CreateNotificationView(
@@ -45,7 +46,8 @@ class TrayDisplay : public SystemTrayItem,
 
   DisplayView* default_;
   DisplayNotificationView* notification_;
-  TrayDisplayMode current_mode_;
+  string16 current_message_;
+  std::map<int64, DisplayInfo> display_info_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
 };