chrome/browser/ui/webui/app_list/start_page_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/app_list/start_page_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, 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

« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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 "chrome/browser/ui/webui/app_list/start_page_ui.h"	5 #include "chrome/browser/ui/webui/app_list/start_page_ui.h"

6	6

7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

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

9 #include "base/memory/ref_counted_memory.h"	9 #include "base/memory/ref_counted_memory.h"

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

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

12 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/profiles/profile.h"	13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/webui/app_list/start_page_handler.h"	14 #include "chrome/browser/ui/webui/app_list/start_page_handler.h"

15 #include "chrome/common/extensions/extension_constants.h"	15 #include "chrome/common/extensions/extension_constants.h"

16 #include "chrome/common/url_constants.h"	16 #include "chrome/common/url_constants.h"

17 #include "content/public/browser/browser_thread.h"	17 #include "content/public/browser/browser_thread.h"

18 #include "content/public/browser/web_ui.h"	18 #include "content/public/browser/web_ui.h"

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self' data:;");	89 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self' data:;");

90 if (base::SysInfo::IsRunningOnChromeOS())	90 if (base::SysInfo::IsRunningOnChromeOS())

91 source->SetRequestFilter(base::Bind(&HandleHotwordFilesResourceFilter,	91 source->SetRequestFilter(base::Bind(&HandleHotwordFilesResourceFilter,

92 Profile::FromWebUI(web_ui())));	92 Profile::FromWebUI(web_ui())));

93 #endif	93 #endif

94	94

95 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui()), source.release());	95 content::WebUIDataSource::Add(Profile::FromWebUI(web_ui()), source.release());

96 }	96 }

97	97

98 } // namespace app_list	98 } // namespace app_list

OLD	NEW