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

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: cleanup test Created 4 years, 5 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
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/common/shell_delegate.h" 7 #include "ash/common/shell_delegate.h"
8 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/common/system/tray/tray_constants.h" 9 #include "ash/common/system/tray/tray_constants.h"
9 #include "ash/common/system/user/tray_user.h" 10 #include "ash/common/system/user/tray_user.h"
10 #include "ash/common/system/user/tray_user_separator.h" 11 #include "ash/common/system/user/tray_user_separator.h"
11 #include "ash/common/system/user/user_view.h" 12 #include "ash/common/system/user/user_view.h"
12 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
13 #include "ash/system/tray/system_tray.h"
14 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
15 #include "ash/test/ash_test_helper.h" 15 #include "ash/test/ash_test_helper.h"
16 #include "ash/test/test_session_state_delegate.h" 16 #include "ash/test/test_session_state_delegate.h"
17 #include "ash/test/test_shell_delegate.h" 17 #include "ash/test/test_shell_delegate.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "components/signin/core/account_id/account_id.h" 19 #include "components/signin/core/account_id/account_id.h"
20 #include "components/user_manager/user_info.h" 20 #include "components/user_manager/user_info.h"
21 #include "ui/accessibility/ax_view_state.h" 21 #include "ui/accessibility/ax_view_state.h"
22 #include "ui/events/test/event_generator.h" 22 #include "ui/events/test/event_generator.h"
23 #include "ui/gfx/animation/animation_container_element.h" 23 #include "ui/gfx/animation/animation_container_element.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // Since the name is capitalized, the email should be different then the 259 // Since the name is capitalized, the email should be different then the
260 // user_id. 260 // user_id.
261 EXPECT_NE(active_user->GetAccountId().GetUserEmail(), 261 EXPECT_NE(active_user->GetAccountId().GetUserEmail(),
262 second_user->GetEmail()); 262 second_user->GetEmail());
263 tray()->CloseSystemBubble(); 263 tray()->CloseSystemBubble();
264 } 264 }
265 265
266 #endif 266 #endif
267 267
268 } // namespace ash 268 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698