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 "components/sync/base/sync_prefs.h" | 5 #include "components/sync/base/sync_prefs.h" |
6 | 6 |
7 #include "base/base64.h" | 7 #include "base/base64.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 base::FilePath SyncPrefs::GetLocalSyncBackendDir() const { | 557 base::FilePath SyncPrefs::GetLocalSyncBackendDir() const { |
558 base::FilePath local_sync_backend_folder = | 558 base::FilePath local_sync_backend_folder = |
559 pref_service_->GetFilePath(prefs::kLocalSyncBackendDir); | 559 pref_service_->GetFilePath(prefs::kLocalSyncBackendDir); |
560 | 560 |
561 #if defined(OS_WIN) | 561 #if defined(OS_WIN) |
562 if (local_sync_backend_folder.empty()) { | 562 if (local_sync_backend_folder.empty()) { |
563 // TODO(pastarmovj): Add DIR_ROAMING_USER_DATA to PathService to simplify | 563 // TODO(pastarmovj): Add DIR_ROAMING_USER_DATA to PathService to simplify |
564 // this code and move the logic in its right place. See crbug/657810. | 564 // this code and move the logic in its right place. See crbug/657810. |
565 CHECK( | 565 CHECK( |
566 base::PathService::Get(base::DIR_APP_DATA, &local_sync_backend_folder)); | 566 base::PathService::Get(base::DIR_APP_DATA, &local_sync_backend_folder)); |
567 local_sync_backend_folder = | 567 |
568 local_sync_backend_folder.Append(FILE_PATH_LITERAL("Chrome/User Data")); | 568 // TODO(pastarmovj): Quick and dirty solution for stage 1 of crbug/694464 |
| 569 // for merging back into Chrome 57. |
| 570 local_sync_backend_folder = local_sync_backend_folder.Append( |
| 571 FILE_PATH_LITERAL("Google/Chrome/User Data")); |
569 } | 572 } |
570 #endif // defined(OS_WIN) | 573 #endif // defined(OS_WIN) |
571 return local_sync_backend_folder; | 574 return local_sync_backend_folder; |
572 } | 575 } |
573 | 576 |
574 } // namespace syncer | 577 } // namespace syncer |
OLD | NEW |