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

Side by Side Diff: ash/wm/overview/scoped_transform_overview_window.cc

Issue 810033010: Remove TransparentActivateWindowButton from Overview Mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/overview/scoped_transform_overview_window.h" 5 #include "ash/wm/overview/scoped_transform_overview_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/screen_util.h" 10 #include "ash/screen_util.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 aura::Window* window) { 160 aura::Window* window) {
161 return TransientDescendantIteratorRange( 161 return TransientDescendantIteratorRange(
162 TransientDescendantIterator(GetTransientRoot(window))); 162 TransientDescendantIterator(GetTransientRoot(window)));
163 } 163 }
164 164
165 } // namespace 165 } // namespace
166 166
167 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow( 167 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow(
168 aura::Window* window) 168 aura::Window* window)
169 : window_(window), 169 : window_(window),
170 activate_button_(new TransparentActivateWindowButton(
171 window_->GetRootWindow(), this)),
172 minimized_(window->GetProperty(aura::client::kShowStateKey) == 170 minimized_(window->GetProperty(aura::client::kShowStateKey) ==
173 ui::SHOW_STATE_MINIMIZED), 171 ui::SHOW_STATE_MINIMIZED),
174 ignored_by_shelf_(wm::GetWindowState(window)->ignored_by_shelf()), 172 ignored_by_shelf_(wm::GetWindowState(window)->ignored_by_shelf()),
175 overview_started_(false), 173 overview_started_(false),
176 original_transform_(window->layer()->GetTargetTransform()), 174 original_transform_(window->layer()->GetTargetTransform()),
177 original_opacity_(window->layer()->GetTargetOpacity()) { 175 original_opacity_(window->layer()->GetTargetOpacity()) {
178 } 176 }
179 177
180 ScopedTransformOverviewWindow::~ScopedTransformOverviewWindow() { 178 ScopedTransformOverviewWindow::~ScopedTransformOverviewWindow() {
181 if (window_) { 179 if (window_) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 window->SetTransform(new_transform); 293 window->SetTransform(new_transform);
296 } 294 }
297 } 295 }
298 296
299 void ScopedTransformOverviewWindow::SetOpacity(float opacity) { 297 void ScopedTransformOverviewWindow::SetOpacity(float opacity) {
300 for (const auto& window : GetTransientTreeIterator(window_)) { 298 for (const auto& window : GetTransientTreeIterator(window_)) {
301 window->layer()->SetOpacity(opacity); 299 window->layer()->SetOpacity(opacity);
302 } 300 }
303 } 301 }
304 302
305 void ScopedTransformOverviewWindow::Select() {
306 wm::GetWindowState(window_)->Activate();
307 }
308
309 void ScopedTransformOverviewWindow::Close() { 303 void ScopedTransformOverviewWindow::Close() {
310 aura::Window* window = GetTransientRoot(window_); 304 aura::Window* window = GetTransientRoot(window_);
311 views::Widget::GetWidgetForNativeView(window)->Close(); 305 views::Widget::GetWidgetForNativeView(window)->Close();
312 } 306 }
313 307
314 void ScopedTransformOverviewWindow::PrepareForOverview() { 308 void ScopedTransformOverviewWindow::PrepareForOverview() {
315 DCHECK(!overview_started_); 309 DCHECK(!overview_started_);
316 overview_started_ = true; 310 overview_started_ = true;
317 wm::GetWindowState(window_)->set_ignored_by_shelf(true); 311 wm::GetWindowState(window_)->set_ignored_by_shelf(true);
318 RestoreWindow(); 312 RestoreWindow();
319 } 313 }
320 314
321 } // namespace ash 315 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698