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

Side by Side Diff: chrome/browser/chromeos/login/login_browsertest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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 (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 <string> 5 #include <string>
6 6
7 #include "ash/common/wm_window.h"
7 #include "ash/shelf/wm_shelf.h" 8 #include "ash/shelf/wm_shelf.h"
8 #include "ash/shell.h" 9 #include "ash/shell.h"
9 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
10 #include "ash/wm_window.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/chromeos/login/login_manager_test.h" 17 #include "chrome/browser/chromeos/login/login_manager_test.h"
18 #include "chrome/browser/chromeos/login/login_wizard.h" 18 #include "chrome/browser/chromeos/login/login_wizard.h"
19 #include "chrome/browser/chromeos/login/startup_utils.h" 19 #include "chrome/browser/chromeos/login/startup_utils.h"
20 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 20 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 content::WindowedNotificationObserver session_start_waiter( 273 content::WindowedNotificationObserver session_start_waiter(
274 chrome::NOTIFICATION_SESSION_STARTED, 274 chrome::NOTIFICATION_SESSION_STARTED,
275 content::NotificationService::AllSources()); 275 content::NotificationService::AllSources());
276 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); 276 SubmitGaiaAuthOfflineForm(kTestUser, kPassword);
277 session_start_waiter.Wait(); 277 session_start_waiter.Wait();
278 278
279 TestSystemTrayIsVisible(); 279 TestSystemTrayIsVisible();
280 } 280 }
281 281
282 } // namespace chromeos 282 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698