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

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

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/overview/scoped_window_copy.cc ('k') | ash/wm/overview/window_selector_item.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.h" 5 #include "ash/wm/overview/window_selector.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/root_window_controller.h" 10 #include "ash/root_window_controller.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } 354 }
355 355
356 void WindowSelector::OnWindowAdded(aura::Window* new_window) { 356 void WindowSelector::OnWindowAdded(aura::Window* new_window) {
357 if (new_window->type() != ui::wm::WINDOW_TYPE_NORMAL && 357 if (new_window->type() != ui::wm::WINDOW_TYPE_NORMAL &&
358 new_window->type() != ui::wm::WINDOW_TYPE_PANEL) { 358 new_window->type() != ui::wm::WINDOW_TYPE_PANEL) {
359 return; 359 return;
360 } 360 }
361 361
362 for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) { 362 for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
363 if (new_window->parent()->id() == kSwitchableWindowContainerIds[i] && 363 if (new_window->parent()->id() == kSwitchableWindowContainerIds[i] &&
364 !views::corewm::GetTransientParent(new_window)) { 364 !::wm::GetTransientParent(new_window)) {
365 // The new window is in one of the switchable containers, abort overview. 365 // The new window is in one of the switchable containers, abort overview.
366 CancelSelection(); 366 CancelSelection();
367 return; 367 return;
368 } 368 }
369 } 369 }
370 } 370 }
371 371
372 void WindowSelector::OnWindowDestroying(aura::Window* window) { 372 void WindowSelector::OnWindowDestroying(aura::Window* window) {
373 // window is one of a container, the restore_focus_window and/or 373 // window is one of a container, the restore_focus_window and/or
374 // one of the selectable windows in overview. 374 // one of the selectable windows in overview.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 // If the window is in the observed_windows_ list it needs to continue to be 469 // If the window is in the observed_windows_ list it needs to continue to be
470 // observed. 470 // observed.
471 if (observed_windows_.find(restore_focus_window_) == 471 if (observed_windows_.find(restore_focus_window_) ==
472 observed_windows_.end()) { 472 observed_windows_.end()) {
473 restore_focus_window_->RemoveObserver(this); 473 restore_focus_window_->RemoveObserver(this);
474 } 474 }
475 restore_focus_window_ = NULL; 475 restore_focus_window_ = NULL;
476 } 476 }
477 477
478 } // namespace ash 478 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overview/scoped_window_copy.cc ('k') | ash/wm/overview/window_selector_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698