chrome/common/extensions/manifest_url_handler.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/common/extensions/manifest_url_handler.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/common/extensions/manifest_url_handler.h"	5 #include "chrome/common/extensions/manifest_url_handler.h"

6	6

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

8 #include "base/lazy_instance.h"	8 #include "base/lazy_instance.h"

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

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

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

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

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

14 #include "chrome/common/chrome_constants.h"	14 #include "chrome/common/chrome_constants.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 "chrome/grit/generated_resources.h"	17 #include "chrome/grit/generated_resources.h"

(...skipping 362 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
380 extension->SetManifestData(keys::kChromeURLOverrides,	380 extension->SetManifestData(keys::kChromeURLOverrides,

381 url_overrides.release());	381 url_overrides.release());

382 return true;	382 return true;

383 }	383 }

384	384

385 const std::vector<std::string> URLOverridesHandler::Keys() const {	385 const std::vector<std::string> URLOverridesHandler::Keys() const {

386 return SingleKey(keys::kChromeURLOverrides);	386 return SingleKey(keys::kChromeURLOverrides);

387 }	387 }

388	388

389 } // namespace extensions	389 } // namespace extensions

OLD	NEW