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

Side by Side Diff: chrome/installer/util/google_chrome_distribution.cc

Issue 57173002: Adds the concept of a 'safe mode' hotkey start (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month 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
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 defines specific implementation of BrowserDistribution class for 5 // This file defines specific implementation of BrowserDistribution class for
6 // Google Chrome. 6 // Google Chrome.
7 7
8 #include "chrome/installer/util/google_chrome_distribution.h" 8 #include "chrome/installer/util/google_chrome_distribution.h"
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 string16* handler_class_uuid) { 273 string16* handler_class_uuid) {
274 if (handler_class_uuid) 274 if (handler_class_uuid)
275 *handler_class_uuid = kCommandExecuteImplUuid; 275 *handler_class_uuid = kCommandExecuteImplUuid;
276 return true; 276 return true;
277 } 277 }
278 278
279 bool GoogleChromeDistribution::AppHostIsSupported() { 279 bool GoogleChromeDistribution::AppHostIsSupported() {
280 return true; 280 return true;
281 } 281 }
282 282
283 int GoogleChromeDistribution::GetSafeModeHotkey() {
284 // Safe mode shortcut is Ctrl+Shift+F10.
285 return MAKEWORD(VK_F10, HOTKEYF_CONTROL | HOTKEYF_SHIFT);
286 }
287
283 // This method checks if we need to change "ap" key in Google Update to try 288 // This method checks if we need to change "ap" key in Google Update to try
284 // full installer as fall back method in case incremental installer fails. 289 // full installer as fall back method in case incremental installer fails.
285 // - If incremental installer fails we append a magic string ("-full"), if 290 // - If incremental installer fails we append a magic string ("-full"), if
286 // it is not present already, so that Google Update server next time will send 291 // it is not present already, so that Google Update server next time will send
287 // full installer to update Chrome on the local machine 292 // full installer to update Chrome on the local machine
288 // - If we are currently running full installer, we remove this magic 293 // - If we are currently running full installer, we remove this magic
289 // string (if it is present) regardless of whether installer failed or not. 294 // string (if it is present) regardless of whether installer failed or not.
290 // There is no fall-back for full installer :) 295 // There is no fall-back for full installer :)
291 void GoogleChromeDistribution::UpdateInstallStatus(bool system_install, 296 void GoogleChromeDistribution::UpdateInstallStatus(bool system_install,
292 installer::ArchiveType archive_type, 297 installer::ArchiveType archive_type,
293 installer::InstallStatus install_status) { 298 installer::InstallStatus install_status) {
294 GoogleUpdateSettings::UpdateInstallStatus(system_install, 299 GoogleUpdateSettings::UpdateInstallStatus(system_install,
295 archive_type, InstallUtil::GetInstallReturnCode(install_status), 300 archive_type, InstallUtil::GetInstallReturnCode(install_status),
296 product_guid()); 301 product_guid());
297 } 302 }
298 303
299 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { 304 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
300 return true; 305 return true;
301 } 306 }
302 307
303 bool GoogleChromeDistribution::HasUserExperiments() { 308 bool GoogleChromeDistribution::HasUserExperiments() {
304 return true; 309 return true;
305 } 310 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698