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

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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
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/drive_file_sync_service.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/message_loop/message_loop_proxy.h" 15 #include "base/message_loop/message_loop_proxy.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
19 #include "chrome/browser/extensions/extension_system.h" 19 #include "chrome/browser/extensions/extension_system.h"
20 #include "chrome/browser/google_apis/drive_api_util.h" 20 #include "chrome/browser/google_apis/drive_api_util.h"
21 #include "chrome/browser/google_apis/drive_notification_manager.h" 21 #include "chrome/browser/google_apis/drive_notification_manager.h"
22 #include "chrome/browser/google_apis/drive_notification_manager_factory.h" 22 #include "chrome/browser/google_apis/drive_notification_manager_factory.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h" 24 #include "chrome/browser/sync_file_system/conflict_resolution_policy.h"
25 #include "chrome/browser/sync_file_system/drive/api_util.h" 25 #include "chrome/browser/sync_file_system/drive/api_util.h"
26 #include "chrome/browser/sync_file_system/drive/local_change_processor_delegate. h" 26 #include "chrome/browser/sync_file_system/drive/local_change_processor_delegate. h"
(...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1764 metadata_store_->SetOriginRootDirectory(origin, resource_id); 1764 metadata_store_->SetOriginRootDirectory(origin, resource_id);
1765 } 1765 }
1766 callback.Run(status, resource_id); 1766 callback.Run(status, resource_id);
1767 } 1767 }
1768 1768
1769 std::string DriveFileSyncService::sync_root_resource_id() { 1769 std::string DriveFileSyncService::sync_root_resource_id() {
1770 return metadata_store_->sync_root_directory(); 1770 return metadata_store_->sync_root_directory();
1771 } 1771 }
1772 1772
1773 } // namespace sync_file_system 1773 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698