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

Side by Side Diff: chrome/installer/setup/setup_main.cc

Issue 10810021: Register Chrome in Active Setup to be called by Windows at user login. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto 147656 Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <windows.h> 5 #include <windows.h>
6 #include <msi.h> 6 #include <msi.h>
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 // Check if we need to show the EULA. If it is passed as a command line 1070 // Check if we need to show the EULA. If it is passed as a command line
1071 // then the dialog is shown and regardless of the outcome setup exits here. 1071 // then the dialog is shown and regardless of the outcome setup exits here.
1072 string16 inner_frame = 1072 string16 inner_frame =
1073 cmd_line.GetSwitchValueNative(installer::switches::kShowEula); 1073 cmd_line.GetSwitchValueNative(installer::switches::kShowEula);
1074 *exit_code = ShowEULADialog(inner_frame); 1074 *exit_code = ShowEULADialog(inner_frame);
1075 if (installer::EULA_REJECTED != *exit_code) { 1075 if (installer::EULA_REJECTED != *exit_code) {
1076 GoogleUpdateSettings::SetEULAConsent( 1076 GoogleUpdateSettings::SetEULAConsent(
1077 original_state, BrowserDistribution::GetDistribution(), true); 1077 original_state, BrowserDistribution::GetDistribution(), true);
1078 } 1078 }
1079 } else if (cmd_line.HasSwitch( 1079 } else if (cmd_line.HasSwitch(
1080 installer::switches::kConfigureUserSettings)) {
1081 DCHECK(installer_state->system_install());
1082 const Product* chrome_install =
1083 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER);
1084 DCHECK(chrome_install);
1085 // TODO(gab): Implement the new shortcut functionality here.
1086 LOG(ERROR) << "--configure-user-settings is not implemented.";
1087 } else if (cmd_line.HasSwitch(
1080 installer::switches::kRegisterChromeBrowser)) { 1088 installer::switches::kRegisterChromeBrowser)) {
1081 installer::InstallStatus status = installer::UNKNOWN_STATUS; 1089 installer::InstallStatus status = installer::UNKNOWN_STATUS;
1082 const Product* chrome_install = 1090 const Product* chrome_install =
1083 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); 1091 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER);
1084 if (chrome_install) { 1092 if (chrome_install) {
1085 // If --register-chrome-browser option is specified, register all 1093 // If --register-chrome-browser option is specified, register all
1086 // Chrome protocol/file associations, as well as register it as a valid 1094 // Chrome protocol/file associations, as well as register it as a valid
1087 // browser for Start Menu->Internet shortcut. This switch will also 1095 // browser for Start Menu->Internet shortcut. This switch will also
1088 // register Chrome as a valid handler for a set of URL protocols that 1096 // register Chrome as a valid handler for a set of URL protocols that
1089 // Chrome may become the default handler for, either by the user marking 1097 // Chrome may become the default handler for, either by the user marking
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1473 if (!(installer_state.is_msi() && is_uninstall)) 1481 if (!(installer_state.is_msi() && is_uninstall))
1474 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1482 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1475 // to pass through, since this is only returned on uninstall which is 1483 // to pass through, since this is only returned on uninstall which is
1476 // never invoked directly by Google Update. 1484 // never invoked directly by Google Update.
1477 return_code = InstallUtil::GetInstallReturnCode(install_status); 1485 return_code = InstallUtil::GetInstallReturnCode(install_status);
1478 1486
1479 VLOG(1) << "Installation complete, returning: " << return_code; 1487 VLOG(1) << "Installation complete, returning: " << return_code;
1480 1488
1481 return return_code; 1489 return return_code;
1482 } 1490 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698