summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration_win.cc
diff options
context:
space:
mode:
authorrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 05:54:51 +0000
committerrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 05:54:51 +0000
commitf6cb1e077174da5c9447271b8731e103a62db6ba (patch)
tree037db348655e730b203374ac632b2d793a3bd055 /chrome/browser/shell_integration_win.cc
parent47f782c2f1e3c1f3c95e345494b6f5a1a670fd21 (diff)
downloadchromium_src-f6cb1e077174da5c9447271b8731e103a62db6ba.zip
chromium_src-f6cb1e077174da5c9447271b8731e103a62db6ba.tar.gz
chromium_src-f6cb1e077174da5c9447271b8731e103a62db6ba.tar.bz2
Revert 30168 - Commit patch set from http://codereview.chromium.org/149796
(see discussion and history there) BUG=10876 TEST=FilePathTest.MatchesExtension.CompareIgnoreCase TBR=rolandsteiner@chromium.org Review URL: http://codereview.chromium.org/337042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
-rw-r--r--chrome/browser/shell_integration_win.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index b340c95..f52a434 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -115,7 +115,11 @@ ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() {
std::wstring short_path;
GetShortPathName(command_line.program().c_str(),
WriteInto(&short_path, MAX_PATH), MAX_PATH);
- if (!FilePath::CompareEqualIgnoreCase(short_path, short_app_path))
+ if ((short_path.size() != short_app_path.size()) ||
+ (!std::equal(short_path.begin(),
+ short_path.end(),
+ short_app_path.begin(),
+ CaseInsensitiveCompare<wchar_t>())))
return NOT_DEFAULT_BROWSER;
}
}