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

Side by Side Diff: chrome/installer/setup/install.h

Issue 12398024: Do not try to make Chrome default when registering it if it can't be made default unattended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « no previous file | chrome/installer/setup/install.cc » ('j') | chrome/installer/setup/install.cc » ('J')
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 // This file contains the specification of setup main functions. 5 // This file contains the specification of setup main functions.
6 6
7 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_ 7 #ifndef CHROME_INSTALLER_SETUP_INSTALL_H_
8 #define CHROME_INSTALLER_SETUP_INSTALL_H_ 8 #define CHROME_INSTALLER_SETUP_INSTALL_H_
9 9
10 #include <vector> 10 #include <vector>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // If creating the Start menu shortcut is successful, it is also pinned to the 73 // If creating the Start menu shortcut is successful, it is also pinned to the
74 // taskbar. 74 // taskbar.
75 void CreateOrUpdateShortcuts( 75 void CreateOrUpdateShortcuts(
76 const base::FilePath& target, 76 const base::FilePath& target,
77 const Product& product, 77 const Product& product,
78 const MasterPreferences& prefs, 78 const MasterPreferences& prefs,
79 InstallShortcutLevel install_level, 79 InstallShortcutLevel install_level,
80 InstallShortcutOperation install_operation); 80 InstallShortcutOperation install_operation);
81 81
82 // Registers Chrome on this machine. 82 // Registers Chrome on this machine.
83 // If |make_chrome_default|, also attempts to make Chrome default (potentially 83 // If |make_chrome_default|, also attempts to make Chrome default.
grt (UTC plus 2) 2013/03/05 03:27:10 is this shorter form correct? // If |make_chrome_d
gab 2013/03/05 16:29:32 Much better :)!
84 // popping a UAC if the user is not an admin and HKLM registrations are required 84 // |make_chrome_default| is ignored if Chrome can't be made default unattended
85 // to register Chrome's capabilities on this version of Windows (i.e. 85 // (except if the only user action required is to accept a UAC; e.g., if the
86 // pre-Win8)). 86 // user is not an admin and HKLM registrations are required to register Chrome's
87 // capabilities on this version of Windows (i.e. pre-Win8)).
87 void RegisterChromeOnMachine(const InstallerState& installer_state, 88 void RegisterChromeOnMachine(const InstallerState& installer_state,
88 const Product& product, 89 const Product& product,
89 bool make_chrome_default); 90 bool make_chrome_default);
90 91
91 // This function installs or updates a new version of Chrome. It returns 92 // This function installs or updates a new version of Chrome. It returns
92 // install status (failed, new_install, updated etc). 93 // install status (failed, new_install, updated etc).
93 // 94 //
94 // setup_path: Path to the executable (setup.exe) as it will be copied 95 // setup_path: Path to the executable (setup.exe) as it will be copied
95 // to Chrome install folder after install is complete 96 // to Chrome install folder after install is complete
96 // archive_path: Path to the archive (chrome.7z) as it will be copied 97 // archive_path: Path to the archive (chrome.7z) as it will be copied
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 bool force); 135 bool force);
135 136
136 // Launches app_host.exe to install content from web store (non-blocking). 137 // Launches app_host.exe to install content from web store (non-blocking).
137 // Returns true on successful execution (although successful installation 138 // Returns true on successful execution (although successful installation
138 // is not guaranteed). 139 // is not guaranteed).
139 bool InstallFromWebstore(const std::string& app_code); 140 bool InstallFromWebstore(const std::string& app_code);
140 141
141 } // namespace installer 142 } // namespace installer
142 143
143 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_ 144 #endif // CHROME_INSTALLER_SETUP_INSTALL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/install.cc » ('j') | chrome/installer/setup/install.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698