OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/first_run/first_run.h" | 5 #include "chrome/browser/first_run/first_run.h" |
6 | 6 |
7 #include <shlobj.h> | 7 #include <shlobj.h> |
8 #include <windows.h> | 8 #include <windows.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 return false; | 103 return false; |
104 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); | 104 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); |
105 if (!dist) | 105 if (!dist) |
106 return false; | 106 return false; |
107 return ShellUtil::CreateChromeDesktopShortcut( | 107 return ShellUtil::CreateChromeDesktopShortcut( |
108 dist, | 108 dist, |
109 chrome_exe.value(), | 109 chrome_exe.value(), |
110 dist->GetAppDescription(), | 110 dist->GetAppDescription(), |
111 L"", | 111 L"", |
112 L"", | 112 L"", |
| 113 chrome_exe.value(), |
| 114 dist->GetIconIndex(), |
113 ShellUtil::CURRENT_USER, | 115 ShellUtil::CURRENT_USER, |
114 false, | 116 false, |
115 true); // create if doesn't exist. | 117 true); // create if doesn't exist. |
116 } | 118 } |
117 | 119 |
118 // Creates the quick launch shortcut to chrome for the current user. Returns | 120 // Creates the quick launch shortcut to chrome for the current user. Returns |
119 // false if it fails. It will overwrite the shortcut if it exists. | 121 // false if it fails. It will overwrite the shortcut if it exists. |
120 bool CreateChromeQuickLaunchShortcut() { | 122 bool CreateChromeQuickLaunchShortcut() { |
121 FilePath chrome_exe; | 123 FilePath chrome_exe; |
122 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) | 124 if (!PathService::Get(base::FILE_EXE, &chrome_exe)) |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 parent_window, | 411 parent_window, |
410 static_cast<uint16>(items_to_import), | 412 static_cast<uint16>(items_to_import), |
411 importer_host, | 413 importer_host, |
412 &importer_observer, | 414 &importer_observer, |
413 importer_list->GetSourceProfileForImporterType(importer_type), | 415 importer_list->GetSourceProfileForImporterType(importer_type), |
414 profile, | 416 profile, |
415 true); | 417 true); |
416 importer_observer.RunLoop(); | 418 importer_observer.RunLoop(); |
417 return importer_observer.import_result(); | 419 return importer_observer.import_result(); |
418 } | 420 } |
OLD | NEW |