OLD | NEW |
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 "chrome/browser/chromeos/login/wallpaper_manager.h" | 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
6 | 6 |
7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
8 #include "ash/desktop_background/desktop_background_controller_observer.h" | 8 #include "ash/desktop_background/desktop_background_controller_observer.h" |
9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 // This test should finish normally. If timeout, it is probably because chrome | 402 // This test should finish normally. If timeout, it is probably because chrome |
403 // can not handle pre migrated user profile (M21 profile or older). | 403 // can not handle pre migrated user profile (M21 profile or older). |
404 } | 404 } |
405 | 405 |
406 class WallpaperManagerBrowserTestNoAnimation | 406 class WallpaperManagerBrowserTestNoAnimation |
407 : public WallpaperManagerBrowserTest { | 407 : public WallpaperManagerBrowserTest { |
408 public: | 408 public: |
409 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 409 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
410 command_line->AppendSwitch(switches::kLoginManager); | 410 command_line->AppendSwitch(switches::kLoginManager); |
411 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); | 411 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); |
412 command_line->AppendSwitch(::switches::kDisableLoginAnimations); | 412 command_line->AppendSwitch(chromeos::switches::kDisableLoginAnimations); |
413 command_line->AppendSwitch(::switches::kDisableBootAnimation); | 413 command_line->AppendSwitch(chromeos::switches::kDisableBootAnimation); |
414 } | 414 } |
415 }; | 415 }; |
416 | 416 |
417 // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But | 417 // Same test as WallpaperManagerBrowserTest.UseMigratedWallpaperInfo. But |
418 // disabled boot and login animation. | 418 // disabled boot and login animation. |
419 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, | 419 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, |
420 PRE_UseMigratedWallpaperInfo) { | 420 PRE_UseMigratedWallpaperInfo) { |
421 // New user log in, a default wallpaper is loaded. | 421 // New user log in, a default wallpaper is loaded. |
422 LogIn(kTestUser1); | 422 LogIn(kTestUser1); |
423 WaitAsyncWallpaperLoad(); | 423 WaitAsyncWallpaperLoad(); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 | 457 |
458 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, | 458 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation, |
459 UsePreMigrationWallpaperInfo) { | 459 UsePreMigrationWallpaperInfo) { |
460 LogIn(kTestUser1); | 460 LogIn(kTestUser1); |
461 WaitAsyncWallpaperLoad(); | 461 WaitAsyncWallpaperLoad(); |
462 // This test should finish normally. If timeout, it is probably because chrome | 462 // This test should finish normally. If timeout, it is probably because chrome |
463 // can not handle pre migrated user profile (M21 profile or older). | 463 // can not handle pre migrated user profile (M21 profile or older). |
464 } | 464 } |
465 | 465 |
466 } // namepace chromeos | 466 } // namepace chromeos |
OLD | NEW |