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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/overview/window_selector_window.h ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/window_selector_window.h" 5 #include "ash/wm/overview/window_selector_window.h"
6 6
7 #include "ui/aura/window.h" 7 #include "ui/aura/window.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
11 WindowSelectorWindow::WindowSelectorWindow(aura::Window* window) 11 WindowSelectorWindow::WindowSelectorWindow(aura::Window* window)
12 : transform_window_(window) { 12 : transform_window_(window) {
13 } 13 }
14 14
15 WindowSelectorWindow::~WindowSelectorWindow() { 15 WindowSelectorWindow::~WindowSelectorWindow() {
16 } 16 }
17 17
18 aura::RootWindow* WindowSelectorWindow::GetRootWindow() { 18 aura::Window* WindowSelectorWindow::GetRootWindow() {
19 return transform_window_.window()->GetRootWindow(); 19 return transform_window_.window()->GetRootWindow();
20 } 20 }
21 21
22 aura::Window* WindowSelectorWindow::TargetedWindow(const aura::Window* target) { 22 aura::Window* WindowSelectorWindow::TargetedWindow(const aura::Window* target) {
23 if (transform_window_.Contains(target)) 23 if (transform_window_.Contains(target))
24 return transform_window_.window(); 24 return transform_window_.window();
25 return NULL; 25 return NULL;
26 } 26 }
27 27
28 void WindowSelectorWindow::RestoreWindowOnExit(aura::Window* window) { 28 void WindowSelectorWindow::RestoreWindowOnExit(aura::Window* window) {
(...skipping 10 matching lines...) Expand all
39 } 39 }
40 40
41 bool WindowSelectorWindow::empty() const { 41 bool WindowSelectorWindow::empty() const {
42 return transform_window_.window() == NULL; 42 return transform_window_.window() == NULL;
43 } 43 }
44 44
45 void WindowSelectorWindow::PrepareForOverview() { 45 void WindowSelectorWindow::PrepareForOverview() {
46 transform_window_.PrepareForOverview(); 46 transform_window_.PrepareForOverview();
47 } 47 }
48 48
49 void WindowSelectorWindow::SetItemBounds(aura::RootWindow* root_window, 49 void WindowSelectorWindow::SetItemBounds(aura::Window* root_window,
50 const gfx::Rect& target_bounds, 50 const gfx::Rect& target_bounds,
51 bool animate) { 51 bool animate) {
52 gfx::Rect src_rect = transform_window_.GetBoundsInScreen(); 52 gfx::Rect src_rect = transform_window_.GetBoundsInScreen();
53 set_bounds(ScopedTransformOverviewWindow:: 53 set_bounds(ScopedTransformOverviewWindow::
54 ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds)); 54 ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds));
55 transform_window_.SetTransform(root_window, 55 transform_window_.SetTransform(root_window,
56 ScopedTransformOverviewWindow::GetTransformForRect(src_rect, bounds()), 56 ScopedTransformOverviewWindow::GetTransformForRect(src_rect, bounds()),
57 animate); 57 animate);
58 } 58 }
59 59
60 } // namespace ash 60 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_window.h ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698