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

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

Issue 2780743002: Remove pre-MD code from TrayDetailsView. (Closed)
Patch Set: rebase + fix Created 3 years, 9 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/common/system/tray/special_popup_row.cc ('k') | ash/common/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/common/system/tray/tray_details_view.h
diff --git a/ash/common/system/tray/tray_details_view.h b/ash/common/system/tray/tray_details_view.h
index 2828763536eeed8422cd3eedd13264d109a0ec78..758b65762adf86b7716dc85171b34436eab6c41c 100644
--- a/ash/common/system/tray/tray_details_view.h
+++ b/ash/common/system/tray/tray_details_view.h
@@ -8,7 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
-#include "ash/common/system/tray/special_popup_row.h"
+#include "ash/common/login_status.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/view_click_listener.h"
#include "base/macros.h"
@@ -48,7 +48,6 @@ class ASH_EXPORT TrayDetailsView : public views::View,
void ButtonPressed(views::Button* sender, const ui::Event& event) final;
SystemTrayItem* owner() { return owner_; }
- SpecialPopupRow* title_row() { return title_row_; }
views::ScrollView* scroller() { return scroller_; }
views::View* scroll_content() { return scroll_content_; }
@@ -56,7 +55,6 @@ class ASH_EXPORT TrayDetailsView : public views::View,
// views::View:
void Layout() override;
int GetHeightForWidth(int width) const override;
- void OnPaintBorder(gfx::Canvas* canvas) override;
// Exposes the layout manager of this view to give control to subclasses.
views::BoxLayout* box_layout() { return box_layout_; }
@@ -121,7 +119,6 @@ class ASH_EXPORT TrayDetailsView : public views::View,
SystemTrayItem* owner_;
views::BoxLayout* box_layout_;
- SpecialPopupRow* title_row_; // Not used in material design.
views::ScrollView* scroller_;
views::View* scroll_content_;
views::ProgressBar* progress_bar_;
« no previous file with comments | « ash/common/system/tray/special_popup_row.cc ('k') | ash/common/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698