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

Unified Diff: ash/common/wm/overview/window_selector_item.cc

Issue 2470343003: Use mirror layer for minimized windows in overview mode (Closed)
Patch Set: Use mirror layer for minimized windows in overview mode 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/wm/overview/window_selector_item.h ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/overview/window_selector_item.cc
diff --git a/ash/common/wm/overview/window_selector_item.cc b/ash/common/wm/overview/window_selector_item.cc
index fce512e0696169a926d067880f9afa44965bc1a6..f76a37ae1eb84ea73dd5e1bbb262e51a5c7edadd 100644
--- a/ash/common/wm/overview/window_selector_item.cc
+++ b/ash/common/wm/overview/window_selector_item.cc
@@ -441,10 +441,6 @@ void WindowSelectorItem::Shutdown() {
FadeOut(std::move(window_label_));
}
-void WindowSelectorItem::ShowWindowOnExit() {
- transform_window_.ShowWindowOnExit();
-}
-
void WindowSelectorItem::PrepareForOverview() {
transform_window_.PrepareForOverview();
UpdateHeaderLayout(HeaderFadeInMode::ENTER,
@@ -516,6 +512,10 @@ void WindowSelectorItem::HideHeader() {
transform_window_.HideHeader();
}
+void WindowSelectorItem::OnMinimizedStateChanged() {
+ transform_window_.UpdateMirrorWindowForMinimizedState();
+}
+
void WindowSelectorItem::SetDimmed(bool dimmed) {
dimmed_ = dimmed;
SetOpacity(dimmed ? kDimmedItemOpacity : 1.0f);
@@ -623,12 +623,12 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) {
params_label.activatable =
views::Widget::InitParams::Activatable::ACTIVATABLE_DEFAULT;
params_label.accept_events = true;
+ window_label_.reset(new views::Widget);
root_window_->GetRootWindowController()
->ConfigureWidgetInitParamsForContainer(
window_label_.get(),
transform_window_.window()->GetParent()->GetShellWindowId(),
&params_label);
- window_label_.reset(new views::Widget);
window_label_->set_focus_on_creation(false);
window_label_->Init(params_label);
window_label_button_view_ = new OverviewLabelButton(this, title);
@@ -787,4 +787,8 @@ gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() {
return background_view_ ? background_view_->animation() : nullptr;
}
+WmWindow* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() {
+ return transform_window_.GetOverviewWindowForMinimizedState();
+}
+
} // namespace ash
« no previous file with comments | « ash/common/wm/overview/window_selector_item.h ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698