chrome/browser/ui/webui/chromeos/drive_internals_ui.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/ui/webui/chromeos/drive_internals_ui.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, 4 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

« no previous file with comments | « chrome/browser/ui/webui/app_list/start_page_ui.cc ('k') | chrome/browser/ui/webui/extensions/extension_error_ui_util.cc » ('j') | no next file with comments »

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/ui/webui/chromeos/drive_internals_ui.h"	5 #include "chrome/browser/ui/webui/chromeos/drive_internals_ui.h"

6	6

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

8 #include "base/file_util.h"

9 #include "base/files/file_enumerator.h"	8 #include "base/files/file_enumerator.h"

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

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

11 #include "base/memory/scoped_vector.h"	11 #include "base/memory/scoped_vector.h"

12 #include "base/memory/weak_ptr.h"	12 #include "base/memory/weak_ptr.h"

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

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

15 #include "base/strings/stringprintf.h"	15 #include "base/strings/stringprintf.h"

16 #include "base/sys_info.h"	16 #include "base/sys_info.h"

17 #include "chrome/browser/chromeos/drive/debug_info_collector.h"	17 #include "chrome/browser/chromeos/drive/debug_info_collector.h"

18 #include "chrome/browser/chromeos/drive/drive.pb.h"	18 #include "chrome/browser/chromeos/drive/drive.pb.h"

19 #include "chrome/browser/chromeos/drive/drive_integration_service.h"	19 #include "chrome/browser/chromeos/drive/drive_integration_service.h"

(...skipping 874 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
894 content::WebUIDataSource::Create(chrome::kChromeUIDriveInternalsHost);	894 content::WebUIDataSource::Create(chrome::kChromeUIDriveInternalsHost);

895 source->AddResourcePath("drive_internals.css", IDR_DRIVE_INTERNALS_CSS);	895 source->AddResourcePath("drive_internals.css", IDR_DRIVE_INTERNALS_CSS);

896 source->AddResourcePath("drive_internals.js", IDR_DRIVE_INTERNALS_JS);	896 source->AddResourcePath("drive_internals.js", IDR_DRIVE_INTERNALS_JS);

897 source->SetDefaultResource(IDR_DRIVE_INTERNALS_HTML);	897 source->SetDefaultResource(IDR_DRIVE_INTERNALS_HTML);

898	898

899 Profile* profile = Profile::FromWebUI(web_ui);	899 Profile* profile = Profile::FromWebUI(web_ui);

900 content::WebUIDataSource::Add(profile, source);	900 content::WebUIDataSource::Add(profile, source);

901 }	901 }

902	902

903 } // namespace chromeos	903 } // namespace chromeos

OLD	NEW