| 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/common/metrics/variations/experiment_labels.h" | 5 #include "chrome/common/variations/experiment_labels.h" |
| 6 |
| 7 #include <vector> |
| 6 | 8 |
| 7 #include "base/logging.h" | 9 #include "base/logging.h" |
| 8 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/string_split.h" | 11 #include "base/strings/string_split.h" |
| 10 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 12 #include "chrome/installer/util/google_update_experiment_util.h" | 14 #include "chrome/installer/util/google_update_experiment_util.h" |
| 13 #include "components/variations/variations_associated_data.h" | 15 #include "components/variations/variations_associated_data.h" |
| 14 | 16 |
| 15 namespace chrome_variations { | 17 namespace chrome_variations { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 DCHECK(!EndsWith(other_labels, separator, false)); | 105 DCHECK(!EndsWith(other_labels, separator, false)); |
| 104 // Note that if either label is empty, a separator is not necessary. | 106 // Note that if either label is empty, a separator is not necessary. |
| 105 base::string16 combined_labels = other_labels; | 107 base::string16 combined_labels = other_labels; |
| 106 if (!other_labels.empty() && !variation_labels.empty()) | 108 if (!other_labels.empty() && !variation_labels.empty()) |
| 107 combined_labels += separator; | 109 combined_labels += separator; |
| 108 combined_labels += variation_labels; | 110 combined_labels += variation_labels; |
| 109 return combined_labels; | 111 return combined_labels; |
| 110 } | 112 } |
| 111 | 113 |
| 112 } // namespace chrome_variations | 114 } // namespace chrome_variations |
| OLD | NEW |