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

Side by Side Diff: chrome/browser/enumerate_modules_model_win.cc

Issue 1210013007: clang/win: Fix warnings to prepare for building without -Wno-reorder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clang-unsequenced
Patch Set: Created 5 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
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/browser/enumerate_modules_model_win.h" 5 #include "chrome/browser/enumerate_modules_model_win.h"
6 6
7 #include <Tlhelp32.h> 7 #include <Tlhelp32.h>
8 #include <wintrust.h> 8 #include <wintrust.h>
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 983
984 url = ConstructHelpCenterUrl(*module); 984 url = ConstructHelpCenterUrl(*module);
985 DCHECK(url.is_valid()); 985 DCHECK(url.is_valid());
986 break; 986 break;
987 } 987 }
988 988
989 lock->Release(); 989 lock->Release();
990 return url; 990 return url;
991 } 991 }
992 992
993
994 EnumerateModulesModel::EnumerateModulesModel() 993 EnumerateModulesModel::EnumerateModulesModel()
995 : limited_mode_(false), 994 : limited_mode_(false),
996 scanning_(false), 995 scanning_(false),
997 conflict_notification_acknowledged_(false), 996 conflict_notification_acknowledged_(false),
998 confirmed_bad_modules_detected_(0), 997 confirmed_bad_modules_detected_(0),
999 suspected_bad_modules_detected_(0), 998 modules_to_notify_about_(0),
1000 modules_to_notify_about_(0) { 999 suspected_bad_modules_detected_(0) {
1001 lock = new base::Lock(); 1000 lock = new base::Lock();
1002 } 1001 }
1003 1002
1004 EnumerateModulesModel::~EnumerateModulesModel() { 1003 EnumerateModulesModel::~EnumerateModulesModel() {
1005 delete lock; 1004 delete lock;
1006 } 1005 }
1007 1006
1008 void EnumerateModulesModel::MaybePostScanningTask() { 1007 void EnumerateModulesModel::MaybePostScanningTask() {
1009 static bool done = false; 1008 static bool done = false;
1010 if (!done) { 1009 if (!done) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 GenerateHash(base::WideToUTF8(module.location), &location); 1064 GenerateHash(base::WideToUTF8(module.location), &location);
1066 GenerateHash(base::WideToUTF8(module.description), &description); 1065 GenerateHash(base::WideToUTF8(module.description), &description);
1067 GenerateHash(base::WideToUTF8(module.digital_signer), &signer); 1066 GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
1068 1067
1069 base::string16 url = 1068 base::string16 url =
1070 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS, 1069 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
1071 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location), 1070 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
1072 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer)); 1071 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
1073 return GURL(base::UTF16ToUTF8(url)); 1072 return GURL(base::UTF16ToUTF8(url));
1074 } 1073 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698