Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1955)

Unified Diff: ash/system/tray/system_tray_unittest.cc

Issue 10535112: Prepare status area to support multiple trays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index a76b27cbf63803a13b1748b0da1605f02465acb9..0c3aeb708b23cb03825bca59839b6cb0d42c4f61 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -21,12 +21,10 @@ namespace test {
namespace {
SystemTray* CreateSystemTray() {
- SystemTray* tray = new SystemTray;
internal::StatusAreaWidget* widget = new internal::StatusAreaWidget;
- widget->AddTray(tray);
- tray->CreateItems();
+ widget->CreateTrayViews(NULL);
widget->Show();
- return tray;
+ return widget->system_tray();
}
// Trivial item implementation that tracks its views for testing.
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698