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

Side by Side Diff: chrome/common/importer/firefox_importer_utils.cc

Issue 1233043003: Remove some legacy versions of StartsWith and EndsWith. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 (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/importer/firefox_importer_utils.h" 5 #include "chrome/common/importer/firefox_importer_utils.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 if (path_components.empty()) 109 if (path_components.empty())
110 return false; 110 return false;
111 // The first path component is special because it may be absolute. Calling 111 // The first path component is special because it may be absolute. Calling
112 // Append with an absolute path component will trigger an assert, so we 112 // Append with an absolute path component will trigger an assert, so we
113 // must handle it differently and initialize output with it. 113 // must handle it differently and initialize output with it.
114 *output = base::FilePath(path_components[0]); 114 *output = base::FilePath(path_components[0]);
115 // Append next path components untill we find the *.app component. When we do, 115 // Append next path components untill we find the *.app component. When we do,
116 // append Contents/MacOS. 116 // append Contents/MacOS.
117 for (size_t i = 1; i < path_components.size(); ++i) { 117 for (size_t i = 1; i < path_components.size(); ++i) {
118 *output = output->Append(path_components[i]); 118 *output = output->Append(path_components[i]);
119 if (base::EndsWith(path_components[i], ".app", true)) { 119 if (base::EndsWith(path_components[i], ".app",
120 base::CompareCase::SENSITIVE)) {
120 *output = output->Append("Contents"); 121 *output = output->Append("Contents");
121 *output = output->Append("MacOS"); 122 *output = output->Append("MacOS");
122 return true; 123 return true;
123 } 124 }
124 } 125 }
125 LOG(ERROR) << path_from_file << " doesn't look like a valid Firefox " 126 LOG(ERROR) << path_from_file << " doesn't look like a valid Firefox "
126 << "installation path: missing /*.app/ directory."; 127 << "installation path: missing /*.app/ directory.";
127 return false; 128 return false;
128 } 129 }
129 #endif // OS_MACOSX 130 #endif // OS_MACOSX
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 } 321 }
321 } 322 }
322 } 323 }
323 } 324 }
324 325
325 base::StringToLowerASCII(&branding_name); 326 base::StringToLowerASCII(&branding_name);
326 if (branding_name.find("iceweasel") != std::string::npos) 327 if (branding_name.find("iceweasel") != std::string::npos)
327 return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_ICEWEASEL); 328 return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_ICEWEASEL);
328 return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX); 329 return l10n_util::GetStringUTF16(IDS_IMPORT_FROM_FIREFOX);
329 } 330 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/chrome_extensions_client.cc ('k') | chrome/common/service_process_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698