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

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

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: wm Created 4 years, 6 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
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/overview/window_selector_controller.cc » ('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 #include <functional> 8 #include <functional>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/ash_switches.h" 13 #include "ash/ash_switches.h"
14 #include "ash/common/accessibility_delegate.h" 14 #include "ash/common/accessibility_delegate.h"
15 #include "ash/common/shelf/wm_shelf.h" 15 #include "ash/common/shelf/wm_shelf.h"
16 #include "ash/common/shell_window_ids.h" 16 #include "ash/common/shell_window_ids.h"
17 #include "ash/common/wm/mru_window_tracker.h"
17 #include "ash/common/wm/panels/panel_layout_manager.h" 18 #include "ash/common/wm/panels/panel_layout_manager.h"
18 #include "ash/common/wm/switchable_windows.h" 19 #include "ash/common/wm/switchable_windows.h"
19 #include "ash/common/wm/window_state.h" 20 #include "ash/common/wm/window_state.h"
20 #include "ash/common/wm/wm_user_metrics_action.h" 21 #include "ash/common/wm/wm_user_metrics_action.h"
21 #include "ash/common/wm_lookup.h" 22 #include "ash/common/wm_lookup.h"
22 #include "ash/common/wm_root_window_controller.h" 23 #include "ash/common/wm_root_window_controller.h"
23 #include "ash/common/wm_shell.h" 24 #include "ash/common/wm_shell.h"
24 #include "ash/common/wm_window.h" 25 #include "ash/common/wm_window.h"
25 #include "ash/shell.h" 26 #include "ash/shell.h"
26 #include "ash/wm/overview/window_grid.h" 27 #include "ash/wm/overview/window_grid.h"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 Move(LEFT, true); 389 Move(LEFT, true);
389 } 390 }
390 if (grid_list_.empty()) 391 if (grid_list_.empty())
391 CancelSelection(); 392 CancelSelection();
392 } 393 }
393 394
394 void WindowSelector::SelectWindow(WmWindow* window) { 395 void WindowSelector::SelectWindow(WmWindow* window) {
395 // Record UMA_WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED if the user is selecting 396 // Record UMA_WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED if the user is selecting
396 // a window other than the window that was active prior to entering overview 397 // a window other than the window that was active prior to entering overview
397 // mode (i.e., the window at the front of the MRU list). 398 // mode (i.e., the window at the front of the MRU list).
398 std::vector<WmWindow*> window_list = WmShell::Get()->GetMruWindowList(); 399 std::vector<WmWindow*> window_list =
400 WmShell::Get()->GetMruWindowTracker()->BuildMruWindowList();
399 if (!window_list.empty() && window_list[0] != window) { 401 if (!window_list.empty() && window_list[0] != window) {
400 WmShell::Get()->RecordUserMetricsAction( 402 WmShell::Get()->RecordUserMetricsAction(
401 wm::WmUserMetricsAction::WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED); 403 wm::WmUserMetricsAction::WINDOW_OVERVIEW_ACTIVE_WINDOW_CHANGED);
402 } 404 }
403 405
404 window->GetWindowState()->Activate(); 406 window->GetWindowState()->Activate();
405 } 407 }
406 408
407 bool WindowSelector::HandleKeyEvent(views::Textfield* sender, 409 bool WindowSelector::HandleKeyEvent(views::Textfield* sender,
408 const ui::KeyEvent& key_event) { 410 const ui::KeyEvent& key_event) {
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 for (size_t i = 0; 622 for (size_t i = 0;
621 i <= grid_list_.size() && 623 i <= grid_list_.size() &&
622 grid_list_[selected_grid_index_]->Move(direction, animate); i++) { 624 grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
623 selected_grid_index_ = 625 selected_grid_index_ =
624 (selected_grid_index_ + display_direction + grid_list_.size()) % 626 (selected_grid_index_ + display_direction + grid_list_.size()) %
625 grid_list_.size(); 627 grid_list_.size();
626 } 628 }
627 } 629 }
628 630
629 } // namespace ash 631 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/overview/window_selector_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698