Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up DEPS per feedback 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
OLDNEW
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/sync_file_system/sync_file_system_service.h" 5 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 16 matching lines...) Expand all
27 #include "chrome/browser/sync_file_system/sync_process_runner.h" 27 #include "chrome/browser/sync_file_system/sync_process_runner.h"
28 #include "chrome/browser/sync_file_system/sync_status_code.h" 28 #include "chrome/browser/sync_file_system/sync_status_code.h"
29 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 29 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
30 #include "components/keyed_service/content/browser_context_dependency_manager.h" 30 #include "components/keyed_service/content/browser_context_dependency_manager.h"
31 #include "content/public/browser/browser_thread.h" 31 #include "content/public/browser/browser_thread.h"
32 #include "content/public/browser/storage_partition.h" 32 #include "content/public/browser/storage_partition.h"
33 #include "extensions/browser/extension_prefs.h" 33 #include "extensions/browser/extension_prefs.h"
34 #include "extensions/browser/extension_registry.h" 34 #include "extensions/browser/extension_registry.h"
35 #include "extensions/common/extension.h" 35 #include "extensions/common/extension.h"
36 #include "extensions/common/manifest_constants.h" 36 #include "extensions/common/manifest_constants.h"
37 #include "storage/browser/fileapi/file_system_context.h"
37 #include "url/gurl.h" 38 #include "url/gurl.h"
38 #include "webkit/browser/fileapi/file_system_context.h"
39 39
40 using content::BrowserThread; 40 using content::BrowserThread;
41 using extensions::Extension; 41 using extensions::Extension;
42 using extensions::ExtensionPrefs; 42 using extensions::ExtensionPrefs;
43 using extensions::ExtensionRegistry; 43 using extensions::ExtensionRegistry;
44 using storage::FileSystemURL; 44 using storage::FileSystemURL;
45 using storage::FileSystemURLSet; 45 using storage::FileSystemURLSet;
46 46
47 namespace sync_file_system { 47 namespace sync_file_system {
48 48
(...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 iter != remote_sync_runners_.end(); ++iter) 747 iter != remote_sync_runners_.end(); ++iter)
748 ((*iter)->*method)(); 748 ((*iter)->*method)();
749 } 749 }
750 750
751 RemoteFileSyncService* SyncFileSystemService::GetRemoteService( 751 RemoteFileSyncService* SyncFileSystemService::GetRemoteService(
752 const GURL& origin) { 752 const GURL& origin) {
753 return remote_service_.get(); 753 return remote_service_.get();
754 } 754 }
755 755
756 } // namespace sync_file_system 756 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698