ash uber tray: Add a tray item for the user.

ash/shell.cc

 // 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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime/input_method_event_filter.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
 #include "ash/system/brightness/tray_brightness.h"
 #include "ash/system/settings/tray_settings.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray_user.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/compact_layout_manager.h"
 #include "ash/wm/compact_status_area_layout_manager.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/panel_window_event_filter.h"
 #include "ash/wm/panel_layout_manager.h"
 #include "ash/wm/partial_screenshot_event_filter.h"
 #include "ash/wm/power_button_controller.h"
@@ skipping 10 matching lines @@
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
@@ skipping 119 matching lines @@
   DummySystemTrayDelegate()
       : muted_(false),
         volume_(0.5) {
   }
 
   virtual ~DummySystemTrayDelegate() {}
 
  private:
 
   // SystemTrayDelegate implementation.
+  virtual const std::string GetUserDisplayName() OVERRIDE {
+    return "chronos";
+  }
+
+  virtual const std::string GetUserEmail() OVERRIDE {
+    return "chr@nos";
+  }
+
+  virtual const SkBitmap& GetUserImage() OVERRIDE {
+    return null_image_;
+  }
+
   virtual void ShowSettings() OVERRIDE {
   }
 
   virtual void ShowHelp() OVERRIDE {
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
     return muted_;
   }
 
   virtual void SetAudioMuted(bool muted) OVERRIDE {
     muted_ = muted;
   }
 
   virtual float GetVolumeLevel() const OVERRIDE {
     return volume_;
   }
 
   virtual void SetVolumeLevel(float volume) OVERRIDE {
     volume_ = volume;
   }
 
+  virtual void ShutDown() OVERRIDE {}
+  virtual void SignOut() OVERRIDE {}
+  virtual void LockScreen() OVERRIDE {}
+
   bool muted_;
   float volume_;
+  SkBitmap null_image_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
 }  // namespace
 
 // static
 Shell* Shell::instance_ = NULL;
 // static
 bool Shell::compact_window_mode_for_test_ = false;
@@ skipping 163 matching lines @@
     // will soon get better once the new one is ready and the old one goes out
     // the door.
     if (delegate_.get())
       status_widget_ = delegate_->CreateStatusArea();
     if (!status_widget_)
       status_widget_ = internal::CreateStatusArea();
     status_widget_->GetContentsView()->RemoveAllChildViews(false);
     tray_.reset(new SystemTray());
     status_widget_->GetContentsView()->AddChildView(tray_.get());
 
+    if (delegate_.get())
+      tray_delegate_.reset(delegate_->CreateSystemTrayDelegate(tray_.get()));
+    if (!tray_delegate_.get())
+      tray_delegate_.reset(new DummySystemTrayDelegate());
+
     internal::TrayVolume* tray_volume = new internal::TrayVolume();
     internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
     audio_controller_ = tray_volume;
     brightness_controller_ = tray_brightness;
 
+    tray_->AddTrayItem(new internal::TrayUser());
     tray_->AddTrayItem(tray_volume);
     tray_->AddTrayItem(tray_brightness);
     tray_->AddTrayItem(new internal::TraySettings());
-
-    if (delegate_.get())
-      tray_delegate_.reset(delegate_->CreateSystemTrayDelegate(tray_.get()));
-    if (!tray_delegate_.get())
-      tray_delegate_.reset(new DummySystemTrayDelegate());
   }
 
   aura::Window* default_container =
       GetContainer(internal::kShellWindowId_DefaultContainer);
   launcher_.reset(new Launcher(default_container));
 
   if (window_mode_ == MODE_COMPACT)
     SetupCompactWindowMode();
   else
     SetupNonCompactWindowMode();
@@ skipping 213 matching lines @@
 
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash