| 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/browser/web_applications/web_app.h" | 5 #include "chrome/browser/web_applications/web_app.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/i18n/file_util_icu.h" | 10 #include "base/i18n/file_util_icu.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 | 226 |
| 227 std::sort(icons->begin(), icons->end(), &IconPrecedes); | 227 std::sort(icons->begin(), icons->end(), &IconPrecedes); |
| 228 } | 228 } |
| 229 #endif | 229 #endif |
| 230 | 230 |
| 231 #if defined(OS_LINUX) | 231 #if defined(OS_LINUX) |
| 232 std::string GetWMClassFromAppName(std::string app_name) { | 232 std::string GetWMClassFromAppName(std::string app_name) { |
| 233 file_util::ReplaceIllegalCharactersInPath(&app_name, '_'); | 233 file_util::ReplaceIllegalCharactersInPath(&app_name, '_'); |
| 234 TrimString(app_name, "_", &app_name); | 234 base::TrimString(app_name, "_", &app_name); |
| 235 return app_name; | 235 return app_name; |
| 236 } | 236 } |
| 237 #endif | 237 #endif |
| 238 | 238 |
| 239 string16 GetAppShortcutsSubdirName() { | 239 string16 GetAppShortcutsSubdirName() { |
| 240 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); | 240 chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel(); |
| 241 if (channel == chrome::VersionInfo::CHANNEL_CANARY) | 241 if (channel == chrome::VersionInfo::CHANNEL_CANARY) |
| 242 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY); | 242 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY); |
| 243 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME); | 243 return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace web_app | 246 } // namespace web_app |
| OLD | NEW |