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

Side by Side Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

Issue 392013005: [#1] Delete reduntdant 19 header files in ui/gfx (8 of 19 by this) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sorted includes Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/users/wallpaper/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/users/wallpaper/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/desktop_background/desktop_background_controller_test_api.h" 9 #include "ash/desktop_background/desktop_background_controller_test_api.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/chromeos/login/users/user.h" 27 #include "chrome/browser/chromeos/login/users/user.h"
28 #include "chrome/browser/chromeos/login/users/user_manager.h" 28 #include "chrome/browser/chromeos/login/users/user_manager.h"
29 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h" 29 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/test/base/in_process_browser_test.h" 31 #include "chrome/test/base/in_process_browser_test.h"
32 #include "chrome/test/base/testing_browser_process.h" 32 #include "chrome/test/base/testing_browser_process.h"
33 #include "chromeos/chromeos_switches.h" 33 #include "chromeos/chromeos_switches.h"
34 #include "chromeos/login/user_names.h" 34 #include "chromeos/login/user_names.h"
35 #include "content/public/test/test_utils.h" 35 #include "content/public/test/test_utils.h"
36 #include "ui/aura/env.h" 36 #include "ui/aura/env.h"
37 #include "ui/gfx/geometry/point.h"
37 #include "ui/gfx/image/image_skia.h" 38 #include "ui/gfx/image/image_skia.h"
38 #include "ui/gfx/point.h"
39 #include "ui/gfx/rect.h" 39 #include "ui/gfx/rect.h"
40 40
41 using namespace ash; 41 using namespace ash;
42 42
43 namespace chromeos { 43 namespace chromeos {
44 44
45 namespace { 45 namespace {
46 46
47 int kLargeWallpaperWidth = 256; 47 int kLargeWallpaperWidth = 256;
48 int kLargeWallpaperHeight = chromeos::kLargeWallpaperMaxHeight; 48 int kLargeWallpaperHeight = chromeos::kLargeWallpaperMaxHeight;
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 802
803 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string()); 803 WallpaperManager::Get()->SetDefaultWallpaperNow(std::string());
804 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished(); 804 wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
805 805
806 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor( 806 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(
807 controller_->GetWallpaper(), 807 controller_->GetWallpaper(),
808 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor)); 808 wallpaper_manager_test_utils::kSmallDefaultWallpaperColor));
809 } 809 }
810 810
811 } // namespace chromeos 811 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698