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 "chrome/common/channel_info.h" | 5 #include "chrome/common/channel_info.h" |
6 | 6 |
7 #include "base/profiler/scoped_tracker.h" | 7 #include "base/profiler/scoped_tracker.h" |
8 #include "components/version_info/version_info.h" | 8 #include "components/version_info/version_info.h" |
| 9 #include "components/version_info/version_string.h" |
9 | 10 |
10 namespace chrome { | 11 namespace chrome { |
11 | 12 |
12 std::string GetVersionString() { | 13 std::string GetVersionString() { |
13 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is | 14 // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is |
14 // fixed. | 15 // fixed. |
15 tracked_objects::ScopedTracker tracking_profile( | 16 tracked_objects::ScopedTracker tracking_profile( |
16 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 17 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
17 "422460 VersionInfo::CreateVersionString")); | 18 "422460 VersionInfo::CreateVersionString")); |
18 | 19 |
19 return version_info::GetVersionStringWithModifier(GetChannelString()); | 20 return version_info::GetVersionStringWithModifier(GetChannelString()); |
20 } | 21 } |
21 | 22 |
22 } // namespace chrome | 23 } // namespace chrome |
OLD | NEW |