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

Unified Diff: ash/shelf/shelf_view.cc

Issue 2828543003: chromeos: converts DragImageViewTest to AshTestBase (Closed)
Patch Set: cleanup Created 3 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/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index c8a3e8214b823bd6b10827497514eb6c3d32ccd7..ed9850e7d232e0684877b1fa47a5eb6ede82b507 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -516,11 +516,10 @@ void ShelfView::CreateDragIconProxy(
const gfx::Vector2d& cursor_offset_from_center,
float scale_factor) {
drag_replaced_view_ = replaced_view;
- WmWindow* root_window =
- WmWindow::Get(drag_replaced_view_->GetWidget()->GetNativeWindow())
- ->GetRootWindow();
- drag_image_.reset(new DragImageView(
- root_window, ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE));
+ aura::Window* root_window =
+ drag_replaced_view_->GetWidget()->GetNativeWindow()->GetRootWindow();
+ drag_image_ = base::MakeUnique<DragImageView>(
+ root_window, ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
drag_image_->SetImage(icon);
gfx::Size size = drag_image_->GetPreferredSize();
size.set_width(size.width() * scale_factor);
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/test/ash_test_base.h » ('j') | ash/test/ash_test_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698