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

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

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/system_tray_unittest.cc ('k') | ash/system/tray/tray_details_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_details_view.h
diff --git a/ash/system/tray/tray_details_view.h b/ash/system/tray/tray_details_view.h
index 044c54d8588a6e50db4eeaa6d743617ca978a4f6..dd8d6fc5b9ca2046d6040c920437c958a07ec449 100644
--- a/ash/system/tray/tray_details_view.h
+++ b/ash/system/tray/tray_details_view.h
@@ -12,6 +12,9 @@ class ScrollView;
}
namespace ash {
+
+class SystemTrayItem;
+
namespace internal {
class FixedSizedScrollView;
@@ -21,7 +24,7 @@ class ViewClickListener;
class TrayDetailsView : public views::View {
public:
- TrayDetailsView();
+ explicit TrayDetailsView(SystemTrayItem* owner);
virtual ~TrayDetailsView();
// Creates a row with special highlighting etc. This is typically the
@@ -35,6 +38,7 @@ class TrayDetailsView : public views::View {
// Removes (and destroys) all child views.
void Reset();
+ SystemTrayItem* owner() const { return owner_; }
SpecialPopupRow* footer() const { return footer_; }
FixedSizedScrollView* scroller() const { return scroller_; }
views::View* scroll_content() const { return scroll_content_; }
@@ -45,6 +49,7 @@ class TrayDetailsView : public views::View {
virtual void OnPaintBorder(gfx::Canvas* canvas) OVERRIDE;
private:
+ SystemTrayItem* owner_;
SpecialPopupRow* footer_;
FixedSizedScrollView* scroller_;
views::View* scroll_content_;
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698