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

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

Issue 2712293002: Remove non-MD code from ShelfButton (Closed)
Patch Set: Rebased Created 3 years, 9 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
« no previous file with comments | « ash/test/shelf_view_test_api.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/shelf/overflow_button.h" 7 #include "ash/common/shelf/overflow_button.h"
8 #include "ash/common/shelf/shelf_button.h" 8 #include "ash/common/shelf/shelf_button.h"
9 #include "ash/common/shelf/shelf_constants.h" 9 #include "ash/common/shelf/shelf_constants.h"
10 #include "ash/common/shelf/shelf_model.h" 10 #include "ash/common/shelf/shelf_model.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 } 128 }
129 129
130 ShelfTooltipManager* ShelfViewTestAPI::tooltip_manager() { 130 ShelfTooltipManager* ShelfViewTestAPI::tooltip_manager() {
131 return &shelf_view_->tooltip_; 131 return &shelf_view_->tooltip_;
132 } 132 }
133 133
134 gfx::Size ShelfViewTestAPI::GetPreferredSize() { 134 gfx::Size ShelfViewTestAPI::GetPreferredSize() {
135 return shelf_view_->GetPreferredSize(); 135 return shelf_view_->GetPreferredSize();
136 } 136 }
137 137
138 int ShelfViewTestAPI::GetButtonSize() {
139 return GetShelfConstant(SHELF_BUTTON_SIZE);
140 }
141
142 int ShelfViewTestAPI::GetButtonSpacing() {
143 return GetShelfConstant(SHELF_BUTTON_SPACING);
144 }
145
146 int ShelfViewTestAPI::GetMinimumDragDistance() const { 138 int ShelfViewTestAPI::GetMinimumDragDistance() const {
147 return ShelfView::kMinimumDragDistance; 139 return ShelfView::kMinimumDragDistance;
148 } 140 }
149 141
150 void ShelfViewTestAPI::ButtonPressed(views::Button* sender, 142 void ShelfViewTestAPI::ButtonPressed(views::Button* sender,
151 const ui::Event& event, 143 const ui::Event& event,
152 views::InkDrop* ink_drop) { 144 views::InkDrop* ink_drop) {
153 return shelf_view_->ButtonPressed(sender, event, ink_drop); 145 return shelf_view_->ButtonPressed(sender, event, ink_drop);
154 } 146 }
155 147
(...skipping 18 matching lines...) Expand all
174 return shelf_view_->dragged_off_from_overflow_to_shelf_; 166 return shelf_view_->dragged_off_from_overflow_to_shelf_;
175 } 167 }
176 168
177 ShelfButtonPressedMetricTracker* 169 ShelfButtonPressedMetricTracker*
178 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { 170 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
179 return &(shelf_view_->shelf_button_pressed_metric_tracker_); 171 return &(shelf_view_->shelf_button_pressed_metric_tracker_);
180 } 172 }
181 173
182 } // namespace test 174 } // namespace test
183 } // namespace ash 175 } // namespace ash
OLDNEW
« no previous file with comments | « 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