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

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

Issue 2463163002: Update chromeos system menu buttons for MD. (Closed)
Patch Set: boxlayout has some annoying dchecks 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
« no previous file with comments | « ash/common/system/tray/tray_popup_label_button.h ('k') | ash/common/system/tray/tray_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_popup_label_button.cc
diff --git a/ash/common/system/tray/tray_popup_label_button.cc b/ash/common/system/tray/tray_popup_label_button.cc
index 73ca15deffa33d729eb1e49ab4b59677c04523f1..1289cd67bd79e0170cd8e0a8798b0f53d8bc458c 100644
--- a/ash/common/system/tray/tray_popup_label_button.cc
+++ b/ash/common/system/tray/tray_popup_label_button.cc
@@ -5,6 +5,7 @@
#include "ash/common/system/tray/tray_popup_label_button.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/system/tray/tray_popup_label_button_border.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/rect.h"
@@ -15,6 +16,7 @@ namespace ash {
TrayPopupLabelButton::TrayPopupLabelButton(views::ButtonListener* listener,
const base::string16& text)
: views::LabelButton(listener, text) {
+ DCHECK(!MaterialDesignController::IsSystemTrayMenuMaterial());
SetBorder(std::unique_ptr<views::Border>(new TrayPopupLabelButtonBorder));
SetFocusForPlatform();
set_animate_on_state_change(false);
« no previous file with comments | « ash/common/system/tray/tray_popup_label_button.h ('k') | ash/common/system/tray/tray_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698