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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2499453002: Add ink drop ripple to overview mode button (Closed)
Patch Set: Fixed crash when there is no window 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/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index 29129125e32c3f8cb3cc35ff621958a39d79211e..f54bee40ba248c0e3f52ff9eec6abfcf8342160d 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -162,7 +162,7 @@ PaletteTray::PaletteTray(WmShelf* wm_shelf)
PaletteTool::RegisterToolInstances(palette_tool_manager_.get());
- SetContentsBackground();
+ SetContentsBackground(true);
SetLayoutManager(new views::FillLayout());
icon_ = new views::ImageView();
@@ -259,7 +259,7 @@ bool PaletteTray::ShowPalette() {
// Show the bubble.
bubble_.reset(new ash::TrayBubbleWrapper(this, bubble_view));
- SetDrawBackgroundAsActive(true);
+ SetIsActive(true);
return true;
}
@@ -300,7 +300,7 @@ void PaletteTray::HideBubbleWithView(const views::TrayBubbleView* bubble_view) {
void PaletteTray::BubbleViewDestroyed() {
palette_tool_manager_->NotifyViewsDestroyed();
- SetDrawBackgroundAsActive(false);
+ SetIsActive(false);
}
void PaletteTray::OnMouseEnteredView() {}

Powered by Google App Engine
This is Rietveld 408576698