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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/test/shell_test_api.h » ('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/launcher/launcher_button.h" 7 #include "ash/launcher/launcher_button.h"
8 #include "ash/launcher/launcher_model.h"
9 #include "ash/shelf/overflow_button.h" 8 #include "ash/shelf/overflow_button.h"
9 #include "ash/shelf/shelf_model.h"
10 #include "ash/shelf/shelf_view.h" 10 #include "ash/shelf/shelf_view.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "ui/views/animation/bounds_animator.h" 12 #include "ui/views/animation/bounds_animator.h"
13 #include "ui/views/view_model.h" 13 #include "ui/views/view_model.h"
14 14
15 namespace { 15 namespace {
16 16
17 // A class used to wait for animations. 17 // A class used to wait for animations.
18 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { 18 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
19 public: 19 public:
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 LauncherItemType typeb) const { 115 LauncherItemType typeb) const {
116 return shelf_view_->SameDragType(typea, typeb); 116 return shelf_view_->SameDragType(typea, typeb);
117 } 117 }
118 118
119 void ShelfViewTestAPI::SetLauncherDelegate(LauncherDelegate* delegate) { 119 void ShelfViewTestAPI::SetLauncherDelegate(LauncherDelegate* delegate) {
120 shelf_view_->delegate_ = delegate; 120 shelf_view_->delegate_ = delegate;
121 } 121 }
122 122
123 } // namespace test 123 } // namespace test
124 } // namespace ash 124 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/test/shell_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698