summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:52:48 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-29 01:52:48 +0000
commit95a21186f2e3a367061832b2eea61afefb71e573 (patch)
tree155af17e7debece8e3112a1c97fac755af1fb57d /ash/test
parent1dc55cd567ffa230519e7508269a747478b3653a (diff)
downloadchromium_src-95a21186f2e3a367061832b2eea61afefb71e573.zip
chromium_src-95a21186f2e3a367061832b2eea61afefb71e573.tar.gz
chromium_src-95a21186f2e3a367061832b2eea61afefb71e573.tar.bz2
ash uber tray: Make it possible for the system to send notifications to the tray.
Volume/Brightness change notifications are sent from the system to the tray. This can be useful to update the tray items when something changes (either automatically, or by means other than the tray itself) BUG=110130,110131 TEST=none Review URL: https://chromiumcodereview.appspot.com/9522003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_shell_delegate.cc3
-rw-r--r--ash/test/test_shell_delegate.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 8eb2dfa..719bd44 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -66,7 +66,8 @@ LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
return NULL;
}
-SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
+SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
+ SystemTray* tray) {
return NULL;
}
} // namespace test
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 7400559..1a621fd 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -32,7 +32,7 @@ class TestShellDelegate : public ShellDelegate {
ScreenshotDelegate* screenshot_delegate) OVERRIDE;
virtual LauncherDelegate* CreateLauncherDelegate(
ash::LauncherModel* model) OVERRIDE;
- virtual SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
+ virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
};
} // namespace test