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

Side by Side Diff: ash/system/user/tray_user_unittest.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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/system/tray/tray_item_view.cc ('k') | ash/touch/touch_hud_debug.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <vector> 5 #include <vector>
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "ash/system/tray/system_tray.h" 11 #include "ash/system/tray/system_tray.h"
12 #include "ash/system/user/tray_user.h" 12 #include "ash/system/user/tray_user.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/test/test_session_state_delegate.h" 14 #include "ash/test/test_session_state_delegate.h"
15 #include "ash/test/test_shell_delegate.h" 15 #include "ash/test/test_shell_delegate.h"
16 #include "ui/aura/test/event_generator.h" 16 #include "ui/aura/test/event_generator.h"
17 #include "ui/base/animation/animation_container_element.h" 17 #include "ui/gfx/animation/animation_container_element.h"
18 #include "ui/views/view.h" 18 #include "ui/views/view.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace ash { 21 namespace ash {
22 namespace internal { 22 namespace internal {
23 23
24 class TrayUserTest : public ash::test::AshTestBase { 24 class TrayUserTest : public ash::test::AshTestBase {
25 public: 25 public:
26 TrayUserTest(); 26 TrayUserTest();
27 27
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 // Switch to a new user. 225 // Switch to a new user.
226 ClickUserItem(&generator, 1); 226 ClickUserItem(&generator, 1);
227 227
228 EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserEmail(1)); 228 EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
229 tray()->CloseSystemBubble(); 229 tray()->CloseSystemBubble();
230 } 230 }
231 231
232 } // namespace internal 232 } // namespace internal
233 } // namespace ash 233 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_item_view.cc ('k') | ash/touch/touch_hud_debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698