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

Side by Side Diff: ui/app_list/views/app_list_main_view_unittest.cc

Issue 2595163002: Add origin() method on View and use it to simplify some callers. (Closed)
Patch Set: Created 3 years, 12 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 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 "ui/app_list/views/app_list_main_view.h" 5 #include "ui/app_list/views/app_list_main_view.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 140 }
141 141
142 // |point| is in |grid_view|'s coordinates. 142 // |point| is in |grid_view|'s coordinates.
143 AppListItemView* SimulateInitiateDrag(AppsGridView* grid_view, 143 AppListItemView* SimulateInitiateDrag(AppsGridView* grid_view,
144 AppsGridView::Pointer pointer, 144 AppsGridView::Pointer pointer,
145 const gfx::Point& point) { 145 const gfx::Point& point) {
146 AppListItemView* view = GetItemViewAtPointInGrid(grid_view, point); 146 AppListItemView* view = GetItemViewAtPointInGrid(grid_view, point);
147 DCHECK(view); 147 DCHECK(view);
148 148
149 gfx::Point translated = 149 gfx::Point translated =
150 gfx::PointAtOffsetFromOrigin(point - view->bounds().origin()); 150 gfx::PointAtOffsetFromOrigin(point - view->origin());
151 ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED, translated, point, 151 ui::MouseEvent pressed_event(ui::ET_MOUSE_PRESSED, translated, point,
152 ui::EventTimeForNow(), 0, 0); 152 ui::EventTimeForNow(), 0, 0);
153 grid_view->InitiateDrag(view, pointer, pressed_event); 153 grid_view->InitiateDrag(view, pointer, pressed_event);
154 return view; 154 return view;
155 } 155 }
156 156
157 // |point| is in |grid_view|'s coordinates. 157 // |point| is in |grid_view|'s coordinates.
158 void SimulateUpdateDrag(AppsGridView* grid_view, 158 void SimulateUpdateDrag(AppsGridView* grid_view,
159 AppsGridView::Pointer pointer, 159 AppsGridView::Pointer pointer,
160 AppListItemView* drag_view, 160 AppListItemView* drag_view,
161 const gfx::Point& point) { 161 const gfx::Point& point) {
162 DCHECK(drag_view); 162 DCHECK(drag_view);
163 gfx::Point translated = 163 gfx::Point translated =
164 gfx::PointAtOffsetFromOrigin(point - drag_view->bounds().origin()); 164 gfx::PointAtOffsetFromOrigin(point - drag_view->origin());
165 ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated, point, 165 ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated, point,
166 ui::EventTimeForNow(), 0, 0); 166 ui::EventTimeForNow(), 0, 0);
167 grid_view->UpdateDragFromItem(pointer, drag_event); 167 grid_view->UpdateDragFromItem(pointer, drag_event);
168 } 168 }
169 169
170 ContentsView* GetContentsView() { return main_view_->contents_view(); } 170 ContentsView* GetContentsView() { return main_view_->contents_view(); }
171 171
172 AppsGridView* RootGridView() { 172 AppsGridView* RootGridView() {
173 return GetContentsView()->apps_container_view()->apps_grid_view(); 173 return GetContentsView()->apps_container_view()->apps_grid_view();
174 } 174 }
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 // The app list model should remain unchanged. 449 // The app list model should remain unchanged.
450 EXPECT_EQ(1, FolderViewModel()->view_size()); 450 EXPECT_EQ(1, FolderViewModel()->view_size());
451 EXPECT_EQ(2, RootViewModel()->view_size()); 451 EXPECT_EQ(2, RootViewModel()->view_size());
452 EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id()); 452 EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id());
453 EXPECT_NE(nullptr, 453 EXPECT_NE(nullptr,
454 delegate_->GetTestModel()->FindFolderItem("single_item_folder")); 454 delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
455 } 455 }
456 456
457 } // namespace test 457 } // namespace test
458 } // namespace app_list 458 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698