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/sxs_linux.h" | 5 #include "chrome/browser/sxs_linux.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 if (std::find(user_data_dir_channels.begin(), | 74 if (std::find(user_data_dir_channels.begin(), |
75 user_data_dir_channels.end(), | 75 user_data_dir_channels.end(), |
76 product_channel_name) != user_data_dir_channels.end()) { | 76 product_channel_name) != user_data_dir_channels.end()) { |
77 // No need to do further disk writes if our channel mark is already present. | 77 // No need to do further disk writes if our channel mark is already present. |
78 return true; | 78 return true; |
79 } | 79 } |
80 | 80 |
81 user_data_dir_channels.push_back(product_channel_name); | 81 user_data_dir_channels.push_back(product_channel_name); |
82 return base::ImportantFileWriter::WriteFileAtomically( | 82 return base::ImportantFileWriter::WriteFileAtomically( |
83 channels_path, | 83 channels_path, |
84 JoinString(user_data_dir_channels, "\n")); | 84 base::JoinString(user_data_dir_channels, "\n")); |
85 } | 85 } |
86 | 86 |
87 } // namespace | 87 } // namespace |
88 | 88 |
89 namespace sxs_linux { | 89 namespace sxs_linux { |
90 | 90 |
91 void AddChannelMarkToUserDataDir() { | 91 void AddChannelMarkToUserDataDir() { |
92 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | 92 DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
93 base::FilePath user_data_dir; | 93 base::FilePath user_data_dir; |
94 if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { | 94 if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) { |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 if (!base::Move(source_path, target_path)) { | 148 if (!base::Move(source_path, target_path)) { |
149 LOG(ERROR) << "Failed to rename '" << source_path.value() | 149 LOG(ERROR) << "Failed to rename '" << source_path.value() |
150 << "' to '" << target_path.value() << "'"; | 150 << "' to '" << target_path.value() << "'"; |
151 return chrome::RESULT_CODE_SXS_MIGRATION_FAILED; | 151 return chrome::RESULT_CODE_SXS_MIGRATION_FAILED; |
152 } | 152 } |
153 | 153 |
154 return content::RESULT_CODE_NORMAL_EXIT; | 154 return content::RESULT_CODE_NORMAL_EXIT; |
155 } | 155 } |
156 | 156 |
157 } // namespace sxs_linux | 157 } // namespace sxs_linux |
OLD | NEW |