| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/platform_util.h" | 5 #include "chrome/common/platform_util.h" |
| 6 | 6 |
| 7 #include <commdlg.h> | 7 #include <commdlg.h> |
| 8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| 11 | 11 |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 | 223 |
| 224 return update_branch; | 224 return update_branch; |
| 225 } | 225 } |
| 226 | 226 |
| 227 } // namespace | 227 } // namespace |
| 228 | 228 |
| 229 string16 GetVersionStringModifier() { | 229 string16 GetVersionStringModifier() { |
| 230 #if defined(GOOGLE_CHROME_BUILD) | 230 #if defined(GOOGLE_CHROME_BUILD) |
| 231 return CurrentChromeChannel(); | 231 return CurrentChromeChannel(); |
| 232 #else | 232 #else |
| 233 return EmptyString16(); | 233 return string16(); |
| 234 #endif | 234 #endif |
| 235 } | 235 } |
| 236 | 236 |
| 237 } // namespace platform_util | 237 } // namespace platform_util |
| OLD | NEW |