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

Unified Diff: ash/wm/workspace/workspace_window_resizer.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/workspace/workspace_window_resizer.cc
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 1540fa2c7169f874b9160283225c96c965cf0e9b..577ba24117c1000f0b59dbe7a2510a57d0d218e0 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -9,7 +9,6 @@
#include <utility>
#include <vector>
-#include "ash/metrics/user_metrics_recorder.h"
#include "ash/wm/common/default_window_resizer.h"
#include "ash/wm/common/dock/docked_window_layout_manager.h"
#include "ash/wm/common/window_positioning_utils.h"
@@ -19,9 +18,9 @@
#include "ash/wm/common/wm_root_window_controller.h"
#include "ash/wm/common/wm_screen_util.h"
#include "ash/wm/common/wm_shell_window_ids.h"
+#include "ash/wm/common/wm_user_metrics_action.h"
#include "ash/wm/common/wm_window.h"
#include "ash/wm/dock/docked_window_resizer.h"
-#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/panels/panel_window_resizer.h"
#include "ash/wm/workspace/phantom_window_controller.h"
#include "ash/wm/workspace/two_step_edge_cycler.h"
@@ -85,8 +84,8 @@ std::unique_ptr<WindowResizer> CreateWindowResizer(
} else {
window_resizer.reset(DefaultWindowResizer::Create(window_state));
}
- window_resizer.reset(
- DragWindowResizer::Create(window_resizer.release(), window_state));
+ window_resizer = window->GetGlobals()->CreateDragWindowResizer(
+ std::move(window_resizer), window_state);
if (window->GetType() == ui::wm::WINDOW_TYPE_PANEL)
window_resizer.reset(
PanelWindowResizer::Create(window_resizer.release(), window_state));
@@ -429,15 +428,15 @@ void WorkspaceWindowResizer::CompleteDrag() {
details().restore_bounds);
}
if (!dock_layout_->is_dragged_window_docked()) {
- UserMetricsRecorder* metrics = globals_->GetUserMetricsRecorder();
// TODO(oshima): Add event source type to WMEvent and move
// metrics recording inside WindowState::OnWMEvent.
const wm::WMEvent event(snap_type_ == SNAP_LEFT ?
wm::WM_EVENT_SNAP_LEFT : wm::WM_EVENT_SNAP_RIGHT);
window_state()->OnWMEvent(&event);
- metrics->RecordUserMetricsAction(
- snap_type_ == SNAP_LEFT ?
- UMA_DRAG_MAXIMIZE_LEFT : UMA_DRAG_MAXIMIZE_RIGHT);
+ globals_->RecordUserMetricsAction(
+ snap_type_ == SNAP_LEFT
+ ? wm::WmUserMetricsAction::DRAG_MAXIMIZE_LEFT
+ : wm::WmUserMetricsAction::DRAG_MAXIMIZE_RIGHT);
snapped = true;
}
}
« ash/wm/common/wm_globals.h ('K') | « ash/wm/workspace/phantom_window_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698