| 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 // This file defines functions that integrate Chrome in Windows shell. These | 5 // This file defines functions that integrate Chrome in Windows shell. These |
| 6 // functions can be used by Chrome as well as Chrome installer. All of the | 6 // functions can be used by Chrome as well as Chrome installer. All of the |
| 7 // work is done by the local functions defined in anonymous namespace in | 7 // work is done by the local functions defined in anonymous namespace in |
| 8 // this class. | 8 // this class. |
| 9 | 9 |
| 10 #include "chrome/installer/util/shell_util.h" | 10 #include "chrome/installer/util/shell_util.h" |
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1236 | 1236 |
| 1237 if (!RegisterChromeBrowser(dist, chrome_exe, string16(), true)) | 1237 if (!RegisterChromeBrowser(dist, chrome_exe, string16(), true)) |
| 1238 return false; | 1238 return false; |
| 1239 | 1239 |
| 1240 // On Windows 8, you can't set yourself as the default handler | 1240 // On Windows 8, you can't set yourself as the default handler |
| 1241 // programatically. In other words IApplicationAssociationRegistration | 1241 // programatically. In other words IApplicationAssociationRegistration |
| 1242 // has been rendered useless. What you can do is to launch | 1242 // has been rendered useless. What you can do is to launch |
| 1243 // "Set Program Associations" section of the "Default Programs" | 1243 // "Set Program Associations" section of the "Default Programs" |
| 1244 // control panel, which is a mess, or pop the concise "How you want to open | 1244 // control panel, which is a mess, or pop the concise "How you want to open |
| 1245 // webpages?" dialog. We choose the latter. | 1245 // webpages?" dialog. We choose the latter. |
| 1246 // Return true only when the user took an action and there was no error. |
| 1246 return LaunchSelectDefaultProtocolHandlerDialog(L"http"); | 1247 return LaunchSelectDefaultProtocolHandlerDialog(L"http"); |
| 1247 } | 1248 } |
| 1248 | 1249 |
| 1249 bool ShellUtil::MakeChromeDefaultProtocolClient(BrowserDistribution* dist, | 1250 bool ShellUtil::MakeChromeDefaultProtocolClient(BrowserDistribution* dist, |
| 1250 const string16& chrome_exe, | 1251 const string16& chrome_exe, |
| 1251 const string16& protocol) { | 1252 const string16& protocol) { |
| 1252 if (!dist->CanSetAsDefault()) | 1253 if (!dist->CanSetAsDefault()) |
| 1253 return false; | 1254 return false; |
| 1254 | 1255 |
| 1255 ShellUtil::RegisterChromeForProtocol(dist, chrome_exe, L"", protocol, true); | 1256 ShellUtil::RegisterChromeForProtocol(dist, chrome_exe, L"", protocol, true); |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1513 chrome_exe.c_str(), | 1514 chrome_exe.c_str(), |
| 1514 shortcut.c_str(), | 1515 shortcut.c_str(), |
| 1515 chrome_path.value().c_str(), | 1516 chrome_path.value().c_str(), |
| 1516 arguments.c_str(), | 1517 arguments.c_str(), |
| 1517 description.c_str(), | 1518 description.c_str(), |
| 1518 icon_path.c_str(), | 1519 icon_path.c_str(), |
| 1519 icon_index, | 1520 icon_index, |
| 1520 app_id.c_str(), | 1521 app_id.c_str(), |
| 1521 ConvertShellUtilShortcutOptionsToFileUtil(options)); | 1522 ConvertShellUtilShortcutOptionsToFileUtil(options)); |
| 1522 } | 1523 } |
| OLD | NEW |