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

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

Issue 2917013002: mash: Move ShelfModel* to ash/public/cpp. (Closed)
Patch Set: Comment on AppList item init. Created 3 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
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | 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/public/cpp/shelf_model.h"
7 #include "ash/shelf/overflow_button.h" 8 #include "ash/shelf/overflow_button.h"
8 #include "ash/shelf/shelf_button.h" 9 #include "ash/shelf/shelf_button.h"
9 #include "ash/shelf/shelf_constants.h" 10 #include "ash/shelf/shelf_constants.h"
10 #include "ash/shelf/shelf_model.h"
11 #include "ash/shelf/shelf_view.h" 11 #include "ash/shelf/shelf_view.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "ui/views/animation/bounds_animator.h" 14 #include "ui/views/animation/bounds_animator.h"
15 #include "ui/views/controls/menu/menu_runner.h" 15 #include "ui/views/controls/menu/menu_runner.h"
16 #include "ui/views/view_model.h" 16 #include "ui/views/view_model.h"
17 17
18 namespace { 18 namespace {
19 19
20 // A class used to wait for animations. 20 // A class used to wait for animations.
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 return shelf_view_->dragged_to_another_shelf_; 152 return shelf_view_->dragged_to_another_shelf_;
153 } 153 }
154 154
155 ShelfButtonPressedMetricTracker* 155 ShelfButtonPressedMetricTracker*
156 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { 156 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() {
157 return &(shelf_view_->shelf_button_pressed_metric_tracker_); 157 return &(shelf_view_->shelf_button_pressed_metric_tracker_);
158 } 158 }
159 159
160 } // namespace test 160 } // namespace test
161 } // namespace ash 161 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698