chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/customization/customization_wallpaper_downloader_browsertest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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

« no previous file with comments | « chrome/browser/chromeos/background/ash_wallpaper_delegate.cc ('k') | chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 <stddef.h>	5 #include <stddef.h>

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "ash/common/wallpaper/wallpaper_controller.h"	9 #include "ash/wallpaper/wallpaper_controller.h"

10 #include "ash/common/wm_shell.h"	10 #include "ash/wm_shell.h"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/files/scoped_temp_dir.h"	12 #include "base/files/scoped_temp_dir.h"

13 #include "base/macros.h"	13 #include "base/macros.h"

14 #include "base/run_loop.h"	14 #include "base/run_loop.h"

15 #include "base/time/time.h"	15 #include "base/time/time.h"

16 #include "chrome/browser/chromeos/customization/customization_document.h"	16 #include "chrome/browser/chromeos/customization/customization_document.h"

17 #include "chrome/browser/chromeos/customization/customization_wallpaper_download er.h"	17 #include "chrome/browser/chromeos/customization/customization_wallpaper_download er.h"

18 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"	18 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

19 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h"	19 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_u tils.h"

20 #include "chrome/test/base/in_process_browser_test.h"	20 #include "chrome/test/base/in_process_browser_test.h"

(...skipping 276 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
297	297

298 observer.WaitForWallpaperAnimationFinished();	298 observer.WaitForWallpaperAnimationFinished();

299 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(	299 EXPECT_TRUE(wallpaper_manager_test_utils::ImageIsNearColor(

300 ash::WmShell::Get()->wallpaper_controller()->GetWallpaper(),	300 ash::WmShell::Get()->wallpaper_controller()->GetWallpaper(),

301 wallpaper_manager_test_utils::kCustomWallpaperColor));	301 wallpaper_manager_test_utils::kCustomWallpaperColor));

302	302

303 EXPECT_EQ(2U, url_factory.num_attempts());	303 EXPECT_EQ(2U, url_factory.num_attempts());

304 }	304 }

305	305

306 } // namespace chromeos	306 } // namespace chromeos

OLD	NEW