| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chrome_version_info.h" | 5 #include "chrome/common/chrome_version_info.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/debug/profiler.h" | 8 #include "base/debug/profiler.h" |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "base/profiler/scoped_tracker.h" |
| 11 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 13 #include "chrome/installer/util/google_update_settings.h" | 14 #include "chrome/installer/util/google_update_settings.h" |
| 14 #include "chrome/installer/util/install_util.h" | 15 #include "chrome/installer/util/install_util.h" |
| 15 | 16 |
| 16 namespace chrome { | 17 namespace chrome { |
| 17 | 18 |
| 18 // static | 19 // static |
| 19 std::string VersionInfo::GetVersionStringModifier() { | 20 std::string VersionInfo::GetVersionStringModifier() { |
| 21 tracked_objects::ScopedTracker tracking_profile( |
| 22 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 23 "422460 VersionInfo::GetVersionStringModifier")); |
| 24 |
| 20 #if defined(GOOGLE_CHROME_BUILD) | 25 #if defined(GOOGLE_CHROME_BUILD) |
| 21 base::FilePath module; | 26 base::FilePath module; |
| 22 base::string16 channel; | 27 base::string16 channel; |
| 23 if (PathService::Get(base::FILE_MODULE, &module)) { | 28 if (PathService::Get(base::FILE_MODULE, &module)) { |
| 24 bool is_system_install = | 29 bool is_system_install = |
| 25 !InstallUtil::IsPerUserInstall(module.value().c_str()); | 30 !InstallUtil::IsPerUserInstall(module.value().c_str()); |
| 26 | 31 |
| 27 GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install, | 32 GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install, |
| 28 &channel); | 33 &channel); |
| 29 } | 34 } |
| (...skipping 27 matching lines...) Expand all Loading... |
| 57 return CHANNEL_DEV; | 62 return CHANNEL_DEV; |
| 58 } else if (channel == L"canary") { | 63 } else if (channel == L"canary") { |
| 59 return CHANNEL_CANARY; | 64 return CHANNEL_CANARY; |
| 60 } | 65 } |
| 61 #endif | 66 #endif |
| 62 | 67 |
| 63 return CHANNEL_UNKNOWN; | 68 return CHANNEL_UNKNOWN; |
| 64 } | 69 } |
| 65 | 70 |
| 66 } // namespace chrome | 71 } // namespace chrome |
| OLD | NEW |