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

Unified Diff: ash/common/system/tray/tray_popup_utils.cc

Issue 2489883005: Fix a couple issues with sticky headers (Closed)
Patch Set: fix crash Created 4 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
Index: ash/common/system/tray/tray_popup_utils.cc
diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc
index 3864fa8dd9891be18cc259886a6ad09ca8ffa947..bb201d1c85b7effe5ecc0238e265bb8748b646e2 100644
--- a/ash/common/system/tray/tray_popup_utils.cc
+++ b/ash/common/system/tray/tray_popup_utils.cc
@@ -5,6 +5,7 @@
#include "ash/common/system/tray/tray_popup_utils.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/ash_view_ids.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/system/tray/fixed_sized_image_view.h"
@@ -13,6 +14,7 @@
#include "ash/common/system/tray/tray_popup_label_button_border.h"
#include "ash/common/wm_shell.h"
#include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/background.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/button/label_button.h"
@@ -190,6 +192,14 @@ views::Slider* TrayPopupUtils::CreateSlider(views::SliderListener* listener) {
return slider;
}
+void TrayPopupUtils::ConfigureAsStickyHeader(views::View* view) {
+ view->set_id(VIEW_ID_STICKY_HEADER);
+ view->set_background(
+ views::Background::CreateSolidBackground(kBackgroundColor));
+ view->SetBorder(
+ views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
+}
+
void TrayPopupUtils::ConfigureContainer(TriView::Container container,
views::View* container_view) {
container_view->SetBorder(CreateDefaultBorder(container));

Powered by Google App Engine
This is Rietveld 408576698