| 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/installer/setup/install.h" | 5 #include "chrome/installer/setup/install.h" |
| 6 | 6 |
| 7 #include <objbase.h> | 7 #include <objbase.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 user_quick_launch_override_.reset( | 130 user_quick_launch_override_.reset( |
| 131 new base::ScopedPathOverride(base::DIR_USER_QUICK_LAUNCH, | 131 new base::ScopedPathOverride(base::DIR_USER_QUICK_LAUNCH, |
| 132 fake_user_quick_launch_.path())); | 132 fake_user_quick_launch_.path())); |
| 133 start_menu_override_.reset( | 133 start_menu_override_.reset( |
| 134 new base::ScopedPathOverride(base::DIR_START_MENU, | 134 new base::ScopedPathOverride(base::DIR_START_MENU, |
| 135 fake_start_menu_.path())); | 135 fake_start_menu_.path())); |
| 136 common_start_menu_override_.reset( | 136 common_start_menu_override_.reset( |
| 137 new base::ScopedPathOverride(base::DIR_COMMON_START_MENU, | 137 new base::ScopedPathOverride(base::DIR_COMMON_START_MENU, |
| 138 fake_common_start_menu_.path())); | 138 fake_common_start_menu_.path())); |
| 139 | 139 |
| 140 base::string16 shortcut_name( | 140 base::string16 shortcut_name(dist_->GetShortcutName() + installer::kLnkExt); |
| 141 dist_->GetShortcutName(BrowserDistribution::SHORTCUT_CHROME) + | |
| 142 installer::kLnkExt); | |
| 143 | 141 |
| 144 user_desktop_shortcut_ = | 142 user_desktop_shortcut_ = |
| 145 fake_user_desktop_.path().Append(shortcut_name); | 143 fake_user_desktop_.path().Append(shortcut_name); |
| 146 user_quick_launch_shortcut_ = | 144 user_quick_launch_shortcut_ = |
| 147 fake_user_quick_launch_.path().Append(shortcut_name); | 145 fake_user_quick_launch_.path().Append(shortcut_name); |
| 148 user_start_menu_shortcut_ = fake_start_menu_.path().Append(shortcut_name); | 146 user_start_menu_shortcut_ = fake_start_menu_.path().Append(shortcut_name); |
| 149 user_start_menu_subdir_shortcut_ = | 147 user_start_menu_subdir_shortcut_ = |
| 150 fake_start_menu_.path() | 148 fake_start_menu_.path() |
| 151 .Append(dist_->GetStartMenuShortcutSubfolder( | 149 .Append(dist_->GetStartMenuShortcutSubfolder( |
| 152 BrowserDistribution::SUBFOLDER_CHROME)) | 150 BrowserDistribution::SUBFOLDER_CHROME)) |
| (...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 installer::EscapeXmlAttributeValueInSingleQuotes(&val); | 813 installer::EscapeXmlAttributeValueInSingleQuotes(&val); |
| 816 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); | 814 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); |
| 817 } | 815 } |
| 818 | 816 |
| 819 TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) { | 817 TEST(EscapeXmlAttributeValueTest, DontEscapeNormalValue) { |
| 820 base::string16 val(L"Google Chrome"); | 818 base::string16 val(L"Google Chrome"); |
| 821 static const wchar_t kExpectedEscapedVal[] = L"Google Chrome"; | 819 static const wchar_t kExpectedEscapedVal[] = L"Google Chrome"; |
| 822 installer::EscapeXmlAttributeValueInSingleQuotes(&val); | 820 installer::EscapeXmlAttributeValueInSingleQuotes(&val); |
| 823 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); | 821 ASSERT_STREQ(kExpectedEscapedVal, val.c_str()); |
| 824 } | 822 } |
| OLD | NEW |