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

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

Issue 22291003: ash:Shelf Update Alternate Layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nl Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/test/launcher_view_test_api.h ('k') | ui/views/bubble/tray_bubble_view.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/launcher_view_test_api.h" 5 #include "ash/test/launcher_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" 8 #include "ash/launcher/launcher_model.h"
9 #include "ash/launcher/launcher_view.h" 9 #include "ash/launcher/launcher_view.h"
10 #include "ash/launcher/overflow_button.h" 10 #include "ash/launcher/overflow_button.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 scoped_ptr<TestAPIAnimationObserver> observer(new TestAPIAnimationObserver()); 88 scoped_ptr<TestAPIAnimationObserver> observer(new TestAPIAnimationObserver());
89 launcher_view_->bounds_animator_->AddObserver(observer.get()); 89 launcher_view_->bounds_animator_->AddObserver(observer.get());
90 90
91 // This nested loop will quit when TestAPIAnimationObserver's 91 // This nested loop will quit when TestAPIAnimationObserver's
92 // OnBoundsAnimatorDone is called. 92 // OnBoundsAnimatorDone is called.
93 base::MessageLoop::current()->Run(); 93 base::MessageLoop::current()->Run();
94 94
95 launcher_view_->bounds_animator_->RemoveObserver(observer.get()); 95 launcher_view_->bounds_animator_->RemoveObserver(observer.get());
96 } 96 }
97 97
98 bool LauncherViewTestAPI::SameDragType(LauncherItemType typea,
99 LauncherItemType typeb) const {
100 return launcher_view_->SameDragType(typea, typeb);
101 }
102
98 } // namespace test 103 } // namespace test
99 } // namespace ash 104 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/launcher_view_test_api.h ('k') | ui/views/bubble/tray_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698