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

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

Issue 231643002: Added labels under the windows in OverviewMode displaying their current name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests, code polishing Created 6 years, 8 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/window_selector_panels.h" 5 #include "ash/wm/overview/window_selector_panels.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/wm/overview/scoped_transform_overview_window.h" 9 #include "ash/wm/overview/scoped_transform_overview_window.h"
10 #include "ash/wm/panels/panel_layout_manager.h" 10 #include "ash/wm/panels/panel_layout_manager.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 (*iter)->RestoreWindowOnExit(); 122 (*iter)->RestoreWindowOnExit();
123 break; 123 break;
124 } 124 }
125 } 125 }
126 } 126 }
127 127
128 aura::Window* WindowSelectorPanels::SelectionWindow() { 128 aura::Window* WindowSelectorPanels::SelectionWindow() {
129 return transform_windows_.front()->window(); 129 return transform_windows_.front()->window();
130 } 130 }
131 131
132 const aura::Window* WindowSelectorPanels::SelectionWindow() const {
133 return transform_windows_.front()->window();
134 }
135
132 void WindowSelectorPanels::RemoveWindow(const aura::Window* window) { 136 void WindowSelectorPanels::RemoveWindow(const aura::Window* window) {
133 for (WindowList::iterator iter = transform_windows_.begin(); 137 for (WindowList::iterator iter = transform_windows_.begin();
134 iter != transform_windows_.end(); ++iter) { 138 iter != transform_windows_.end(); ++iter) {
135 if ((*iter)->window() == window) { 139 if ((*iter)->window() == window) {
136 (*iter)->OnWindowDestroyed(); 140 (*iter)->OnWindowDestroyed();
137 transform_windows_.erase(iter); 141 transform_windows_.erase(iter);
138 break; 142 break;
139 } 143 }
140 } 144 }
141 } 145 }
(...skipping 29 matching lines...) Expand all
171 transform.Translate(bounding_rect.x() - bounds.x(), 175 transform.Translate(bounding_rect.x() - bounds.x(),
172 bounding_rect.y() - bounds.y()); 176 bounding_rect.y() - bounds.y());
173 transform.PreconcatTransform(bounding_transform); 177 transform.PreconcatTransform(bounding_transform);
174 transform.Translate(bounds.x() - bounding_rect.x(), 178 transform.Translate(bounds.x() - bounding_rect.x(),
175 bounds.y() - bounding_rect.y()); 179 bounds.y() - bounding_rect.y());
176 (*iter)->SetTransform(root_window, transform, animate); 180 (*iter)->SetTransform(root_window, transform, animate);
177 } 181 }
178 } 182 }
179 183
180 } // namespace ash 184 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698