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

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

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 6 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/common/shelf/shelf_constants.h" 7 #include "ash/common/shelf/shelf_constants.h"
8 #include "ash/common/shelf/shelf_model.h" 8 #include "ash/common/shelf/shelf_model.h"
9 #include "ash/shelf/overflow_button.h" 9 #include "ash/shelf/overflow_button.h"
10 #include "ash/shelf/shelf_button.h" 10 #include "ash/shelf/shelf_button.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 ShelfTooltipManager* ShelfViewTestAPI::tooltip_manager() { 105 ShelfTooltipManager* ShelfViewTestAPI::tooltip_manager() {
106 return &shelf_view_->tooltip_; 106 return &shelf_view_->tooltip_;
107 } 107 }
108 108
109 gfx::Size ShelfViewTestAPI::GetPreferredSize() { 109 gfx::Size ShelfViewTestAPI::GetPreferredSize() {
110 return shelf_view_->GetPreferredSize(); 110 return shelf_view_->GetPreferredSize();
111 } 111 }
112 112
113 int ShelfViewTestAPI::GetButtonSize() { 113 int ShelfViewTestAPI::GetButtonSize() {
114 return kShelfButtonSize; 114 return GetShelfConstant(SHELF_BUTTON_SIZE);
115 } 115 }
116 116
117 int ShelfViewTestAPI::GetButtonSpacing() { 117 int ShelfViewTestAPI::GetButtonSpacing() {
118 return kShelfButtonSpacing; 118 return GetShelfConstant(SHELF_BUTTON_SPACING);
119 } 119 }
120 120
121 void ShelfViewTestAPI::ButtonPressed(views::Button* sender, 121 void ShelfViewTestAPI::ButtonPressed(views::Button* sender,
122 const ui::Event& event) { 122 const ui::Event& event) {
123 return shelf_view_->ButtonPressed(sender, event); 123 return shelf_view_->ButtonPressed(sender, event);
124 } 124 }
125 125
126 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea, 126 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,
127 ShelfItemType typeb) const { 127 ShelfItemType typeb) const {
128 return shelf_view_->SameDragType(typea, typeb); 128 return shelf_view_->SameDragType(typea, typeb);
(...skipping 15 matching lines...) Expand all
144 return shelf_view_->dragged_off_from_overflow_to_shelf_; 144 return shelf_view_->dragged_off_from_overflow_to_shelf_;
145 } 145 }
146 146
147 ShelfButtonPressedMetricTracker* 147 ShelfButtonPressedMetricTracker*
148 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { 148 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
149 return &(shelf_view_->shelf_button_pressed_metric_tracker_); 149 return &(shelf_view_->shelf_button_pressed_metric_tracker_);
150 } 150 }
151 151
152 } // namespace test 152 } // namespace test
153 } // namespace ash 153 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698