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

Side by Side Diff: ash/system/overview/overview_button_tray.cc

Issue 2895713002: [mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode (Closed)
Patch Set: Address nits, unit_tests target compiles Created 3 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/system/overview/overview_button_tray.h" 5 #include "ash/system/overview/overview_button_tray.h"
6 6
7 #include "ash/resources/vector_icons/vector_icons.h" 7 #include "ash/resources/vector_icons/vector_icons.h"
8 #include "ash/session/session_controller.h" 8 #include "ash/session/session_controller.h"
9 #include "ash/shelf/shelf_constants.h" 9 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_port.h" 11 #include "ash/shell_port.h"
12 #include "ash/strings/grit/ash_strings.h" 12 #include "ash/strings/grit/ash_strings.h"
13 #include "ash/system/tray/tray_constants.h" 13 #include "ash/system/tray/tray_constants.h"
14 #include "ash/system/tray/tray_container.h" 14 #include "ash/system/tray/tray_container.h"
15 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 15 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
16 #include "ash/wm/mru_window_tracker.h" 16 #include "ash/wm/mru_window_tracker.h"
17 #include "ash/wm/overview/window_selector_controller.h" 17 #include "ash/wm/overview/window_selector_controller.h"
18 #include "ash/wm_window.h"
19 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/gfx/paint_vector_icon.h" 19 #include "ui/gfx/paint_vector_icon.h"
21 #include "ui/views/border.h" 20 #include "ui/views/border.h"
22 #include "ui/views/controls/image_view.h" 21 #include "ui/views/controls/image_view.h"
23 #include "ui/wm/core/window_util.h" 22 #include "ui/wm/core/window_util.h"
24 23
25 namespace ash { 24 namespace ash {
26 25
27 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf) 26 OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf)
28 : TrayBackgroundView(wm_shelf), 27 : TrayBackgroundView(wm_shelf),
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 if (!Shell::Get()->window_selector_controller()->IsSelecting()) 62 if (!Shell::Get()->window_selector_controller()->IsSelecting())
64 return true; 63 return true;
65 64
66 MruWindowTracker::WindowList mru_window_list = 65 MruWindowTracker::WindowList mru_window_list =
67 Shell::Get()->mru_window_tracker()->BuildMruWindowList(); 66 Shell::Get()->mru_window_tracker()->BuildMruWindowList();
68 67
69 // Switch to the second most recently used window (most recent is the 68 // Switch to the second most recently used window (most recent is the
70 // current window), if it exists. 69 // current window), if it exists.
71 if (mru_window_list.size() > 1) { 70 if (mru_window_list.size() > 1) {
72 AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr); 71 AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
73 ::wm::ActivateWindow(WmWindow::GetAuraWindow(mru_window_list[1])); 72 ::wm::ActivateWindow(mru_window_list[1]);
74 return true; 73 return true;
75 } 74 }
76 } 75 }
77 } 76 }
78 77
79 WindowSelectorController* controller = 78 WindowSelectorController* controller =
80 Shell::Get()->window_selector_controller(); 79 Shell::Get()->window_selector_controller();
81 // Note: Toggling overview mode will fail if there is no window to show, the 80 // Note: Toggling overview mode will fail if there is no window to show, the
82 // screen is locked, a modal dialog is open or is running in kiosk app 81 // screen is locked, a modal dialog is open or is running in kiosk app
83 // session. 82 // session.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 SetVisible( 128 SetVisible(
130 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() && 129 shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
131 session_controller->IsActiveUserSessionStarted() && 130 session_controller->IsActiveUserSessionStarted() &&
132 !session_controller->IsScreenLocked() && 131 !session_controller->IsScreenLocked() &&
133 session_controller->GetSessionState() == 132 session_controller->GetSessionState() ==
134 session_manager::SessionState::ACTIVE && 133 session_manager::SessionState::ACTIVE &&
135 !session_controller->IsKioskSession()); 134 !session_controller->IsKioskSession());
136 } 135 }
137 136
138 } // namespace ash 137 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698