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

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

Issue 338133002: Remove unnecessary #includes in system_tray.cc and tray_user_unittest.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/system/tray/system_tray.cc ('k') | no next file » | 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/ash_switches.h"
8 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
9 #include "ash/session/user_info.h" 8 #include "ash/session/user_info.h"
10 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shell.h" 10 #include "ash/shell.h"
12 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
13 #include "ash/system/tray/system_tray.h" 12 #include "ash/system/tray/system_tray.h"
14 #include "ash/system/tray/tray_constants.h" 13 #include "ash/system/tray/tray_constants.h"
15 #include "ash/system/user/tray_user.h" 14 #include "ash/system/user/tray_user.h"
16 #include "ash/system/user/tray_user_separator.h" 15 #include "ash/system/user/tray_user_separator.h"
17 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
18 #include "ash/test/test_session_state_delegate.h" 17 #include "ash/test/test_session_state_delegate.h"
19 #include "ash/test/test_shell_delegate.h" 18 #include "ash/test/test_shell_delegate.h"
20 #include "base/command_line.h"
21 #include "ui/aura/test/event_generator.h" 19 #include "ui/aura/test/event_generator.h"
22 #include "ui/gfx/animation/animation_container_element.h" 20 #include "ui/gfx/animation/animation_container_element.h"
23 #include "ui/views/view.h" 21 #include "ui/views/view.h"
24 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
25 23
26 namespace ash { 24 namespace ash {
27 25
28 class TrayUserTest : public ash::test::AshTestBase { 26 class TrayUserTest : public ash::test::AshTestBase {
29 public: 27 public:
30 TrayUserTest(); 28 TrayUserTest();
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID()); 242 EXPECT_EQ(active_user->GetUserID(), second_user->GetUserID());
245 // Since the name is capitalized, the email should be different then the 243 // Since the name is capitalized, the email should be different then the
246 // user_id. 244 // user_id.
247 EXPECT_NE(active_user->GetUserID(), second_user->GetEmail()); 245 EXPECT_NE(active_user->GetUserID(), second_user->GetEmail());
248 tray()->CloseSystemBubble(); 246 tray()->CloseSystemBubble();
249 } 247 }
250 248
251 #endif 249 #endif
252 250
253 } // namespace ash 251 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698