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

Unified Diff: ui/views/controls/button/label_button.cc

Issue 2639203007: Update SetPaintToLayer to accept LayerType (Closed)
Patch Set: Refactor Created 3 years, 11 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
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 21891fca927332c33e9336ab28c08d6d08eabedd..c47e145a6fd6bd23dd6219686228781a005a5fde 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
+#include "ui/compositor/layer_type.h"
#include "ui/gfx/animation/throb_animation.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
@@ -99,7 +100,7 @@ LabelButton::LabelButton(ButtonListener* listener, const base::string16& text)
SetTextInternal(text);
AddChildView(ink_drop_container_);
- ink_drop_container_->SetPaintToLayer(true);
+ ink_drop_container_->SetPaintToLayer(ui::LAYER_TEXTURED);
ink_drop_container_->layer()->SetFillsBoundsOpaquely(false);
ink_drop_container_->SetVisible(false);
@@ -423,13 +424,13 @@ void LabelButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
}
void LabelButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
- image()->SetPaintToLayer(true);
+ image()->SetPaintToLayer(ui::LAYER_TEXTURED);
image()->layer()->SetFillsBoundsOpaquely(false);
ink_drop_container_->AddInkDropLayer(ink_drop_layer);
}
void LabelButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
- image()->SetPaintToLayer(false);
+ image()->SetPaintToLayer(ui::LAYER_NOT_DRAWN);
ink_drop_container_->RemoveInkDropLayer(ink_drop_layer);
}

Powered by Google App Engine
This is Rietveld 408576698