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

Unified Diff: ash/system/palette/common_palette_tool.cc

Issue 2829763002: [Ash] Remove HoverHighlightView::AddLabelDeprecated() (Closed)
Patch Set: Created 3 years, 8 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/system/network/network_state_list_detailed_view.cc ('k') | ash/system/tray/hover_highlight_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/palette/common_palette_tool.cc
diff --git a/ash/system/palette/common_palette_tool.cc b/ash/system/palette/common_palette_tool.cc
index 3d2436bb6b7552e1f931f0342308c575f98d7cb3..7aae0ed9f96ab27e0936b1157ea4bd1786e6dda3 100644
--- a/ash/system/palette/common_palette_tool.cc
+++ b/ash/system/palette/common_palette_tool.cc
@@ -19,7 +19,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/views/border.h"
#include "ui/views/controls/label.h"
namespace ash {
@@ -80,14 +79,9 @@ void CommonPaletteTool::OnViewClicked(views::View* sender) {
views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {
gfx::ImageSkia icon =
CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);
-
highlight_view_ = new HoverHighlightView(this);
- highlight_view_->SetBorder(views::CreateEmptyBorder(0, 0, 0, 0));
highlight_view_->AddIconAndLabel(icon, name);
- highlight_view_->set_custom_height(kMenuButtonSize);
-
TrayPopupUtils::InitializeAsCheckableRow(highlight_view_, enabled());
-
return highlight_view_;
}
« no previous file with comments | « ash/system/network/network_state_list_detailed_view.cc ('k') | ash/system/tray/hover_highlight_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698