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

Side by Side Diff: cloud_print/virtual_driver/win/install/setup.cc

Issue 1507413003: clang/win: Let some chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_browsertests Created 5 years 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 <windows.h> 5 #include <windows.h>
6 #include <setupapi.h> // Must be included after windows.h 6 #include <setupapi.h> // Must be included after windows.h
7 #include <winspool.h> 7 #include <winspool.h>
8 #include <iomanip> 8 #include <iomanip>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 UINT CALLBACK CabinetCallback(PVOID data, 187 UINT CALLBACK CabinetCallback(PVOID data,
188 UINT notification, 188 UINT notification,
189 UINT_PTR param1, 189 UINT_PTR param1,
190 UINT_PTR param2) { 190 UINT_PTR param2) {
191 const base::FilePath* temp_path( 191 const base::FilePath* temp_path(
192 reinterpret_cast<const base::FilePath*>(data)); 192 reinterpret_cast<const base::FilePath*>(data));
193 if (notification == SPFILENOTIFY_FILEINCABINET) { 193 if (notification == SPFILENOTIFY_FILEINCABINET) {
194 FILE_IN_CABINET_INFO* info = 194 FILE_IN_CABINET_INFO* info =
195 reinterpret_cast<FILE_IN_CABINET_INFO*>(param1); 195 reinterpret_cast<FILE_IN_CABINET_INFO*>(param1);
196 for (int i = 0; i < arraysize(kDependencyList); i++) { 196 for (size_t i = 0; i < arraysize(kDependencyList); i++) {
197 base::FilePath base_name(info->NameInCabinet); 197 base::FilePath base_name(info->NameInCabinet);
198 base_name = base_name.BaseName(); 198 base_name = base_name.BaseName();
199 if (base::FilePath::CompareEqualIgnoreCase(base_name.value().c_str(), 199 if (base::FilePath::CompareEqualIgnoreCase(base_name.value().c_str(),
200 kDependencyList[i])) { 200 kDependencyList[i])) {
201 StringCchCopy(info->FullTargetName, MAX_PATH, 201 StringCchCopy(info->FullTargetName, MAX_PATH,
202 temp_path->Append(kDependencyList[i]).value().c_str()); 202 temp_path->Append(kDependencyList[i]).value().c_str());
203 return FILEOP_DOIT; 203 return FILEOP_DOIT;
204 } 204 }
205 } 205 }
206 return FILEOP_SKIP; 206 return FILEOP_SKIP;
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 550
551 VLOG(0) << GetErrorMessage(retval) 551 VLOG(0) << GetErrorMessage(retval)
552 << " HRESULT=0x" << std::setbase(16) << retval; 552 << " HRESULT=0x" << std::setbase(16) << retval;
553 553
554 // Installer is silent by default as required by Google Update. 554 // Installer is silent by default as required by Google Update.
555 if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) { 555 if (base::CommandLine::ForCurrentProcess()->HasSwitch("verbose")) {
556 DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME)); 556 DisplayWindowsMessage(NULL, retval, LoadLocalString(IDS_DRIVER_NAME));
557 } 557 }
558 return retval; 558 return retval;
559 } 559 }
OLDNEW
« no previous file with comments | « chrome_elf/blacklist/blacklist.cc ('k') | components/crash/content/app/hard_error_handler_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698