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

Side by Side Diff: chrome/browser/chrome_browser_main_win.cc

Issue 13864015: Move app launcher and chrome apps shortcut strings into the installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@migrate_app_id_fix
Patch Set: fix linux unit tests Created 7 years, 2 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/browser/chrome_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 if (result != chrome::RESULT_CODE_UNINSTALL_USER_CANCEL) { 118 if (result != chrome::RESULT_CODE_UNINSTALL_USER_CANCEL) {
119 // The following actions are just best effort. 119 // The following actions are just best effort.
120 VLOG(1) << "Executing uninstall actions"; 120 VLOG(1) << "Executing uninstall actions";
121 if (!first_run::RemoveSentinel()) 121 if (!first_run::RemoveSentinel())
122 VLOG(1) << "Failed to delete sentinel file."; 122 VLOG(1) << "Failed to delete sentinel file.";
123 base::FilePath chrome_exe; 123 base::FilePath chrome_exe;
124 if (PathService::Get(base::FILE_EXE, &chrome_exe)) { 124 if (PathService::Get(base::FILE_EXE, &chrome_exe)) {
125 ShellUtil::ShortcutLocation user_shortcut_locations[] = { 125 ShellUtil::ShortcutLocation user_shortcut_locations[] = {
126 ShellUtil::SHORTCUT_LOCATION_DESKTOP, 126 ShellUtil::SHORTCUT_LOCATION_DESKTOP,
127 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH, 127 ShellUtil::SHORTCUT_LOCATION_QUICK_LAUNCH,
128 ShellUtil::SHORTCUT_LOCATION_START_MENU, 128 ShellUtil::SHORTCUT_LOCATION_START_MENU_CHROME_DIR,
129 }; 129 };
130 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); 130 BrowserDistribution* dist = BrowserDistribution::GetDistribution();
131 for (size_t i = 0; i < arraysize(user_shortcut_locations); ++i) { 131 for (size_t i = 0; i < arraysize(user_shortcut_locations); ++i) {
132 if (!ShellUtil::RemoveShortcuts(user_shortcut_locations[i], dist, 132 if (!ShellUtil::RemoveShortcuts(user_shortcut_locations[i], dist,
133 ShellUtil::CURRENT_USER, chrome_exe)) { 133 ShellUtil::CURRENT_USER, chrome_exe)) {
134 VLOG(1) << "Failed to delete shortcut at location " 134 VLOG(1) << "Failed to delete shortcut at location "
135 << user_shortcut_locations[i]; 135 << user_shortcut_locations[i];
136 } 136 }
137 } 137 }
138 } else { 138 } else {
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (resource_id) 393 if (resource_id)
394 return l10n_util::GetStringUTF16(resource_id); 394 return l10n_util::GetStringUTF16(resource_id);
395 return string16(); 395 return string16();
396 } 396 }
397 397
398 // static 398 // static
399 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 399 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
400 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 400 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
401 installer::SetTranslationDelegate(&delegate); 401 installer::SetTranslationDelegate(&delegate);
402 } 402 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698