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

Unified Diff: ash/wm/aura/wm_globals_aura.cc

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: ash/wm/aura/wm_globals_aura.cc
diff --git a/ash/wm/aura/wm_globals_aura.cc b/ash/wm/aura/wm_globals_aura.cc
index 7de57d99fdfb5a85129734278baa3529482be4b4..fe21613452368817d269796bb2ad27784955e3c8 100644
--- a/ash/wm/aura/wm_globals_aura.cc
+++ b/ash/wm/aura/wm_globals_aura.cc
@@ -12,8 +12,11 @@
#include "ash/wm/common/wm_activation_observer.h"
#include "ash/wm/common/wm_display_observer.h"
#include "ash/wm/common/wm_overview_mode_observer.h"
+#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/mru_window_tracker.h"
+#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/window_util.h"
+#include "base/memory/ptr_util.h"
#include "ui/aura/client/focus_client.h"
#include "ui/wm/public/activation_client.h"
@@ -109,8 +112,29 @@ std::vector<WmWindow*> WmGlobalsAura::GetAllRootWindows() {
return wm_windows;
}
-UserMetricsRecorder* WmGlobalsAura::GetUserMetricsRecorder() {
- return Shell::GetInstance()->metrics();
+void WmGlobalsAura::RecordUserMetricsAction(WmUserMetricsAction action) {
+ return Shell::GetInstance()->metrics()->RecordUserMetricsAction(action);
+}
+
+std::unique_ptr<WindowResizer> WmGlobalsAura::CreateDragWindowResizer(
+ std::unique_ptr<WindowResizer> next_window_resizer,
+ wm::WindowState* window_state) {
+ return base::WrapUnique(
+ DragWindowResizer::Create(next_window_resizer.release(), window_state));
+}
+
+bool WmGlobalsAura::IsOverviewModeSelecting() {
+ WindowSelectorController* window_selector_controller =
+ Shell::GetInstance()->window_selector_controller();
+ return window_selector_controller &&
+ window_selector_controller->IsSelecting();
+}
+
+bool WmGlobalsAura::IsOverviewModeRestoringMinimizedWindows() {
+ WindowSelectorController* window_selector_controller =
+ Shell::GetInstance()->window_selector_controller();
+ return window_selector_controller &&
+ window_selector_controller->IsRestoringMinimizedWindows();
}
void WmGlobalsAura::AddActivationObserver(WmActivationObserver* observer) {

Powered by Google App Engine
This is Rietveld 408576698