From bfb411316d5d6f6a29e01a88f7a94b545b827776 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" 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/shell_main.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ash/shell/shell_main.cc') diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc index 7d7715d..86601e9 100644 --- a/ash/shell/shell_main.cc +++ b/ash/shell/shell_main.cc @@ -208,6 +208,10 @@ class ShellDelegateImpl : public ash::ShellDelegate { return launcher_delegate_; } + virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() { + return NULL; + } + private: // Used to update Launcher. Owned by main. WindowWatcher* watcher_; -- cgit v1.1