chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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/login/kiosk_browsertest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "apps/app_window.h"	5 #include "apps/app_window.h"

6 #include "apps/app_window_registry.h"	6 #include "apps/app_window_registry.h"

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/shell.h"	9 #include "ash/shell.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

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

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

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

14 #include "base/memory/scoped_ptr.h"	14 #include "base/memory/scoped_ptr.h"

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

16 #include "base/prefs/pref_service.h"	16 #include "base/prefs/pref_service.h"

17 #include "base/strings/string_number_conversions.h"	17 #include "base/strings/string_number_conversions.h"

18 #include "base/strings/string_util.h"	18 #include "base/strings/string_util.h"

19 #include "base/synchronization/lock.h"	19 #include "base/synchronization/lock.h"

20 #include "chrome/browser/browser_process.h"	20 #include "chrome/browser/browser_process.h"

21 #include "chrome/browser/chrome_notification_types.h"	21 #include "chrome/browser/chrome_notification_types.h"

22 #include "chrome/browser/chromeos/app_mode/fake_cws.h"	22 #include "chrome/browser/chromeos/app_mode/fake_cws.h"

(...skipping 1382 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1405 content::WindowedNotificationObserver(	1405 content::WindowedNotificationObserver(

1406 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,	1406 chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,

1407 content::NotificationService::AllSources()).Wait();	1407 content::NotificationService::AllSources()).Wait();

1408	1408

1409 // Wait for the wallpaper to load.	1409 // Wait for the wallpaper to load.

1410 WaitForWallpaper();	1410 WaitForWallpaper();

1411 EXPECT_TRUE(wallpaper_loaded());	1411 EXPECT_TRUE(wallpaper_loaded());

1412 }	1412 }

1413	1413

1414 } // namespace chromeos	1414 } // namespace chromeos

OLD	NEW