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

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

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix single-letter typo :(. Created 8 years, 1 month 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/tray_details_view.h ('k') | ash/system/tray/tray_empty.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_details_view.cc
diff --git a/ash/system/tray/tray_details_view.cc b/ash/system/tray/tray_details_view.cc
index 4e74bd652d91bcf413f0e2e3937125e5dc02641c..6a9f4157062df32a2303c941112572bf40350714 100644
--- a/ash/system/tray/tray_details_view.cc
+++ b/ash/system/tray/tray_details_view.cc
@@ -4,6 +4,7 @@
#include "ash/system/tray/tray_details_view.h"
+#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_views.h"
#include "ui/gfx/canvas.h"
@@ -39,8 +40,9 @@ class ScrollBorder : public views::Border {
DISALLOW_COPY_AND_ASSIGN(ScrollBorder);
};
-TrayDetailsView::TrayDetailsView()
- : footer_(NULL),
+TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
+ : owner_(owner),
+ footer_(NULL),
scroller_(NULL),
scroll_content_(NULL),
scroll_border_(NULL) {
« no previous file with comments | « ash/system/tray/tray_details_view.h ('k') | ash/system/tray/tray_empty.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698