chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.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/input_method/component_extension_ime_manager_impl.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/chromeos/imageburner/burn_manager.cc ('k') | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/chromeos/input_method/component_extension_ime_manager_i mpl.h"	5 #include "chrome/browser/chromeos/input_method/component_extension_ime_manager_i mpl.h"

6	6

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

8	8

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

10 #include "base/json/json_string_value_serializer.h"	10 #include "base/json/json_string_value_serializer.h"

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

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

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

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

15 #include "chrome/browser/extensions/component_loader.h"	15 #include "chrome/browser/extensions/component_loader.h"

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

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

18 #include "chrome/browser/profiles/profile_manager.h"	18 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

(...skipping 467 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
487	487

488 ComponentExtensionEngine engine;	488 ComponentExtensionEngine engine;

489 ReadEngineComponent(component_ime, *dictionary, &engine);	489 ReadEngineComponent(component_ime, *dictionary, &engine);

490 component_ime.engines.push_back(engine);	490 component_ime.engines.push_back(engine);

491 }	491 }

492 out_imes->push_back(component_ime);	492 out_imes->push_back(component_ime);

493 }	493 }

494 }	494 }

495	495

496 } // namespace chromeos	496 } // namespace chromeos

OLD	NEW