| OLD | NEW |
| 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/common/system/tray/tray_constants.h" |
| 7 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 11 #include "ash/shell_delegate.h" |
| 11 #include "ash/system/tray/system_tray.h" | 12 #include "ash/system/tray/system_tray.h" |
| 12 #include "ash/system/tray/tray_constants.h" | |
| 13 #include "ash/system/user/tray_user.h" | 13 #include "ash/system/user/tray_user.h" |
| 14 #include "ash/system/user/tray_user_separator.h" | 14 #include "ash/system/user/tray_user_separator.h" |
| 15 #include "ash/system/user/user_view.h" | 15 #include "ash/system/user/user_view.h" |
| 16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
| 17 #include "ash/test/test_session_state_delegate.h" | 17 #include "ash/test/test_session_state_delegate.h" |
| 18 #include "ash/test/test_shell_delegate.h" | 18 #include "ash/test/test_shell_delegate.h" |
| 19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
| 20 #include "components/signin/core/account_id/account_id.h" | 20 #include "components/signin/core/account_id/account_id.h" |
| 21 #include "components/user_manager/user_info.h" | 21 #include "components/user_manager/user_info.h" |
| 22 #include "ui/accessibility/ax_view_state.h" | 22 #include "ui/accessibility/ax_view_state.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 // Since the name is capitalized, the email should be different then the | 268 // Since the name is capitalized, the email should be different then the |
| 269 // user_id. | 269 // user_id. |
| 270 EXPECT_NE(active_user->GetAccountId().GetUserEmail(), | 270 EXPECT_NE(active_user->GetAccountId().GetUserEmail(), |
| 271 second_user->GetEmail()); | 271 second_user->GetEmail()); |
| 272 tray()->CloseSystemBubble(); | 272 tray()->CloseSystemBubble(); |
| 273 } | 273 } |
| 274 | 274 |
| 275 #endif | 275 #endif |
| 276 | 276 |
| 277 } // namespace ash | 277 } // namespace ash |
| OLD | NEW |