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

Side by Side Diff: ash/test/shelf_view_test_api.cc

Issue 2820693004: shelf: Allow dragging items from main shelf to overflow shelf. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/shelf_view_test_api.h" 5 #include "ash/test/shelf_view_test_api.h"
6 6
7 #include "ash/shelf/overflow_button.h" 7 #include "ash/shelf/overflow_button.h"
8 #include "ash/shelf/shelf_button.h" 8 #include "ash/shelf/shelf_button.h"
9 #include "ash/shelf/shelf_constants.h" 9 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shelf/shelf_model.h" 10 #include "ash/shelf/shelf_model.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 155 }
156 156
157 gfx::Rect ShelfViewTestAPI::GetBoundsForDragInsertInScreen() { 157 gfx::Rect ShelfViewTestAPI::GetBoundsForDragInsertInScreen() {
158 return shelf_view_->GetBoundsForDragInsertInScreen(); 158 return shelf_view_->GetBoundsForDragInsertInScreen();
159 } 159 }
160 160
161 bool ShelfViewTestAPI::IsRippedOffFromShelf() { 161 bool ShelfViewTestAPI::IsRippedOffFromShelf() {
162 return shelf_view_->dragged_off_shelf_; 162 return shelf_view_->dragged_off_shelf_;
163 } 163 }
164 164
165 bool ShelfViewTestAPI::DraggedItemFromOverflowToShelf() { 165 bool ShelfViewTestAPI::DraggedItemFromShelfToOtherShelf() {
166 return shelf_view_->dragged_off_from_overflow_to_shelf_; 166 return shelf_view_->dragged_off_from_shelf_to_other_shelf_;
167 } 167 }
168 168
169 ShelfButtonPressedMetricTracker* 169 ShelfButtonPressedMetricTracker*
170 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { 170 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
171 return &(shelf_view_->shelf_button_pressed_metric_tracker_); 171 return &(shelf_view_->shelf_button_pressed_metric_tracker_);
172 } 172 }
173 173
174 } // namespace test 174 } // namespace test
175 } // namespace ash 175 } // namespace ash
OLDNEW
« ash/test/shelf_view_test_api.h ('K') | « ash/test/shelf_view_test_api.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698