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..cbe38ea5de743d3f1b0c9950029c2d8343200d58 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -5,8 +5,13 @@
 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
 
+#include <map>
+
+#include "ash/ash_export.h"
 #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,23 +20,22 @@ class View;
 namespace ash {
 namespace internal {
 
-enum TrayDisplayMode {
-  TRAY_DISPLAY_SINGLE,
-  TRAY_DISPLAY_EXTENDED,
-  TRAY_DISPLAY_MIRRORED,
-  TRAY_DISPLAY_DOCKED,
-};
-
 class DisplayView;
 class DisplayNotificationView;
 
-class TrayDisplay : public SystemTrayItem,
-                    public DisplayController::Observer {
+class ASH_EXPORT TrayDisplay : public SystemTrayItem,
+                               public DisplayController::Observer {
  public:
   explicit TrayDisplay(SystemTray* system_tray);
   virtual ~TrayDisplay();
 
  private:
+  friend class TrayDisplayTest;
+
+  // 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(
@@ -43,9 +47,16 @@ class TrayDisplay : public SystemTrayItem,
   // Overridden from DisplayControllerObserver:
   virtual void OnDisplayConfigurationChanged() OVERRIDE;
 
+  // Test utilities.
+  bool IsDisplayViewVisibleForTest();
+  base::string16 GetTrayDisplayTextForTest();
+  base::string16 GetTrayDisplayTooltipTextForTest();
+  base::string16 GetDisplayNotificationTextForTest();
+
   DisplayView* default_;
   DisplayNotificationView* notification_;
-  TrayDisplayMode current_mode_;
+  string16 current_message_;
+  std::map<int64, DisplayInfo> display_info_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
 };