From bfb411316d5d6f6a29e01a88f7a94b545b827776 Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
 <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Feb 2012 20:59:27 +0000
Subject: ash: A first step for the uber tray.

As a first step, there are items to open settings, help pages, and an item to
allow [un]muting volume.

The resources have not been uploaded yet. That will be done in a separate CL to
allow this one to go through trybots etc.

This new uber-tray can be turned on at runtime using --ash-uber-tray flag.

BUG=110130
TEST=none yet. will be added when a little more fleshed out.

Review URL: https://chromiumcodereview.appspot.com/9463039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123799 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/shell.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ash/shell.h')

diff --git a/ash/shell.h b/ash/shell.h
index db60bae..5a57c24 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -42,6 +42,8 @@ class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
 class ShellDelegate;
+class SystemTrayDelegate;
+class SystemTray;
 class VideoDetector;
 class WindowCycleController;
 
@@ -188,11 +190,14 @@ class ASH_EXPORT Shell {
   }
 
   ShellDelegate* delegate() { return delegate_.get(); }
+  SystemTrayDelegate* tray_delegate() { return tray_delegate_.get(); }
 
   Launcher* launcher() { return launcher_.get(); }
 
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
+  SystemTray* tray() const { return tray_.get(); }
+
   // Made available for tests.
   internal::ShadowController* shadow_controller() {
     return shadow_controller_.get();
@@ -240,6 +245,7 @@ class ASH_EXPORT Shell {
 #endif  // !defined(OS_MACOSX)
 
   scoped_ptr<ShellDelegate> delegate_;
+  scoped_ptr<SystemTrayDelegate> tray_delegate_;
 
   scoped_ptr<Launcher> launcher_;
 
@@ -287,6 +293,10 @@ class ASH_EXPORT Shell {
   // Status area with clock, Wi-Fi signal, etc.
   views::Widget* status_widget_;
 
+  // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
+  // |status_widget_|).
+  scoped_ptr<SystemTray> tray_;
+
   // Offset between the corner of the status area and the corner of the screen
   // when in the compact window mode.
   gfx::Size compact_status_area_offset_;
-- 
cgit v1.1