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

Unified Diff: ash/wm/overview/window_selector.cc

Issue 115153002: wm: public window_types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ozone deps Created 7 years 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/wm/gestures/two_finger_drag_handler.cc ('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/wm/overview/window_selector.cc
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index f4d8bd08f698b36e53a204d03c760221e89a53b2..56ea4553cfb7c31db2bf23409e3949fdf5f769bf 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -275,7 +275,7 @@ WindowSelector::WindowSelector(const WindowList& windows,
windows[i]->AddObserver(this);
observed_windows_.insert(windows[i]);
- if (windows[i]->type() == aura::client::WINDOW_TYPE_PANEL &&
+ if (windows[i]->type() == ui::wm::WINDOW_TYPE_PANEL &&
wm::GetWindowState(windows[i])->panel_attached()) {
// Attached panel windows are grouped into a single overview item per
// root window (display).
@@ -393,8 +393,8 @@ void WindowSelector::CancelSelection() {
}
void WindowSelector::OnWindowAdded(aura::Window* new_window) {
- if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL &&
- new_window->type() != aura::client::WINDOW_TYPE_PANEL) {
+ if (new_window->type() != ui::wm::WINDOW_TYPE_NORMAL &&
+ new_window->type() != ui::wm::WINDOW_TYPE_PANEL) {
return;
}
« no previous file with comments | « ash/wm/gestures/two_finger_drag_handler.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698