chrome/browser/chromeos/login/screens/update_screen.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/screens/update_screen.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) 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/screens/update_screen.h"	5 #include "chrome/browser/chromeos/login/screens/update_screen.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8	8

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

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

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

12 #include "base/message_loop/message_loop.h"	12 #include "base/message_loop/message_loop.h"

13 #include "base/threading/thread_restrictions.h"	13 #include "base/threading/thread_restrictions.h"

14 #include "chrome/browser/chromeos/login/screens/error_screen.h"	14 #include "chrome/browser/chromeos/login/screens/error_screen.h"

15 #include "chrome/browser/chromeos/login/screens/screen_observer.h"	15 #include "chrome/browser/chromeos/login/screens/screen_observer.h"

16 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"	16 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"

17 #include "chrome/browser/chromeos/login/startup_utils.h"	17 #include "chrome/browser/chromeos/login/startup_utils.h"

18 #include "chrome/browser/chromeos/login/wizard_controller.h"	18 #include "chrome/browser/chromeos/login/wizard_controller.h"

19 #include "chromeos/dbus/dbus_thread_manager.h"	19 #include "chromeos/dbus/dbus_thread_manager.h"

20 #include "chromeos/network/network_state.h"	20 #include "chromeos/network/network_state.h"

(...skipping 492 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
513 GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,	513 GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,

514 std::string());	514 std::string());

515 break;	515 break;

516 default:	516 default:

517 NOTREACHED();	517 NOTREACHED();

518 break;	518 break;

519 }	519 }

520 }	520 }

521	521

522 } // namespace chromeos	522 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/login/startup_utils.cc » ('j') | no next file with comments »