chrome/browser/prefs/leveldb_pref_store.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/prefs/leveldb_pref_store.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/prefs/chrome_pref_service_unittest.cc ('k') | chrome/browser/prefs/leveldb_pref_store_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/prefs/leveldb_pref_store.h"	5 #include "chrome/browser/prefs/leveldb_pref_store.h"

6	6

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

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

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/location.h"	11 #include "base/location.h"

12 #include "base/metrics/sparse_histogram.h"	12 #include "base/metrics/sparse_histogram.h"

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

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

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

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

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

18 #include "third_party/leveldatabase/env_chromium.h"	18 #include "third_party/leveldatabase/env_chromium.h"

19 #include "third_party/leveldatabase/src/include/leveldb/db.h"	19 #include "third_party/leveldatabase/src/include/leveldb/db.h"

(...skipping 390 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
410 }	410 }

411	411

412 // TODO(dgrogan): Call pref_filter_->FilterOnLoad	412 // TODO(dgrogan): Call pref_filter_->FilterOnLoad

413	413

414 if (error_delegate_.get() && read_error_ != PREF_READ_ERROR_NONE)	414 if (error_delegate_.get() && read_error_ != PREF_READ_ERROR_NONE)

415 error_delegate_->OnError(read_error_);	415 error_delegate_->OnError(read_error_);

416	416

417 FOR_EACH_OBSERVER(	417 FOR_EACH_OBSERVER(

418 PrefStore::Observer, observers_, OnInitializationCompleted(true));	418 PrefStore::Observer, observers_, OnInitializationCompleted(true));

419 }	419 }

OLD	NEW