summaryrefslogtreecommitdiffstats
path: root/ash/shell/shell_main.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 20:59:27 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 20:59:27 +0000
commitbfb411316d5d6f6a29e01a88f7a94b545b827776 (patch)
tree99c45616a22f3cb190dd7f068edfdd8941e6d524 /ash/shell/shell_main.cc
parentbdb730765e736232e1f69a908bbeee3b54393934 (diff)
downloadchromium_src-bfb411316d5d6f6a29e01a88f7a94b545b827776.zip
chromium_src-bfb411316d5d6f6a29e01a88f7a94b545b827776.tar.gz
chromium_src-bfb411316d5d6f6a29e01a88f7a94b545b827776.tar.bz2
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
Diffstat (limited to 'ash/shell/shell_main.cc')
-rw-r--r--ash/shell/shell_main.cc4
1 files changed, 4 insertions, 0 deletions
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_;