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

Side by Side Diff: chrome/installer/setup/update_active_setup_version_work_item.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/installer/setup/update_active_setup_version_work_item.h" 5 #include "chrome/installer/setup/update_active_setup_version_work_item.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (operation_ == UPDATE_AND_BUMP_OS_UPGRADES_COMPONENT) { 62 if (operation_ == UPDATE_AND_BUMP_OS_UPGRADES_COMPONENT) {
63 uint32_t previous_value; 63 uint32_t previous_value;
64 if (!base::StringToUint(version_components[OS_UPGRADES], &previous_value)) { 64 if (!base::StringToUint(version_components[OS_UPGRADES], &previous_value)) {
65 LOG(WARNING) << "Couldn't process previous OS_UPGRADES Active Setup " 65 LOG(WARNING) << "Couldn't process previous OS_UPGRADES Active Setup "
66 "version component: " << version_components[OS_UPGRADES]; 66 "version component: " << version_components[OS_UPGRADES];
67 previous_value = 0; 67 previous_value = 0;
68 } 68 }
69 version_components[OS_UPGRADES] = base::UintToString16(previous_value + 1); 69 version_components[OS_UPGRADES] = base::UintToString16(previous_value + 1);
70 } 70 }
71 71
72 return JoinString(version_components, L','); 72 return base::JoinString(version_components, L",");
73 } 73 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/permission_set_unittest.cc ('k') | chrome/test/base/extension_js_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698