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

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: 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
Index: ash/wm/overview/window_selector.cc
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index db5255b3c1701158c9f94853151721d2fa01fcca..b52d9dfaf647fa329583aeceafdf3c03e3c6b448 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -261,7 +261,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).
@@ -384,8 +384,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;
}

Powered by Google App Engine
This is Rietveld 408576698