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

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

Issue 731373002: Enable MSVC warning for unused locals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another Windows fix Created 6 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
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/installer/setup/setup_main.h" 5 #include "chrome/installer/setup/setup_main.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <msi.h> 8 #include <msi.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 << product.distribution()->GetDisplayName() 1525 << product.distribution()->GetDisplayName()
1526 << " is already installed."; 1526 << " is already installed.";
1527 higher_products |= (1 << product.distribution()->GetType()); 1527 higher_products |= (1 << product.distribution()->GetType());
1528 } 1528 }
1529 } 1529 }
1530 1530
1531 if (higher_products != 0) { 1531 if (higher_products != 0) {
1532 COMPILE_ASSERT(BrowserDistribution::NUM_TYPES == 4, 1532 COMPILE_ASSERT(BrowserDistribution::NUM_TYPES == 4,
1533 add_support_for_new_products_here_); 1533 add_support_for_new_products_here_);
1534 const uint32 kBrowserBit = 1 << BrowserDistribution::CHROME_BROWSER; 1534 const uint32 kBrowserBit = 1 << BrowserDistribution::CHROME_BROWSER;
1535 const uint32 kAppHostBit = 1 << BrowserDistribution::CHROME_APP_HOST;
1536 int message_id = 0; 1535 int message_id = 0;
1537 1536
1538 proceed_with_installation = false; 1537 proceed_with_installation = false;
1539 install_status = HIGHER_VERSION_EXISTS; 1538 install_status = HIGHER_VERSION_EXISTS;
1540 switch (higher_products) { 1539 switch (higher_products) {
1541 case kBrowserBit: 1540 case kBrowserBit:
1542 message_id = IDS_INSTALL_HIGHER_VERSION_BASE; 1541 message_id = IDS_INSTALL_HIGHER_VERSION_BASE;
1543 break; 1542 break;
1544 default: 1543 default:
1545 message_id = IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER_BASE; 1544 message_id = IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER_BASE;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT 1831 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
1833 // to pass through, since this is only returned on uninstall which is 1832 // to pass through, since this is only returned on uninstall which is
1834 // never invoked directly by Google Update. 1833 // never invoked directly by Google Update.
1835 return_code = InstallUtil::GetInstallReturnCode(install_status); 1834 return_code = InstallUtil::GetInstallReturnCode(install_status);
1836 } 1835 }
1837 1836
1838 VLOG(1) << "Installation complete, returning: " << return_code; 1837 VLOG(1) << "Installation complete, returning: " << return_code;
1839 1838
1840 return return_code; 1839 return return_code;
1841 } 1840 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/sync_internals_message_handler.cc ('k') | chrome/installer/util/installation_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698