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

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

Issue 2039403002: Renamed AppMenuBadgeController to AppMenuIconController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed identifiers in Cocoa file Created 4 years, 6 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <wintrust.h> 10 #include <wintrust.h>
(...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 if (conflict_notification_acknowledged_) 854 if (conflict_notification_acknowledged_)
855 return false; 855 return false;
856 856
857 return confirmed_bad_modules_detected_ > 0; 857 return confirmed_bad_modules_detected_ > 0;
858 } 858 }
859 859
860 void EnumerateModulesModel::AcknowledgeConflictNotification() { 860 void EnumerateModulesModel::AcknowledgeConflictNotification() {
861 if (!conflict_notification_acknowledged_) { 861 if (!conflict_notification_acknowledged_) {
862 conflict_notification_acknowledged_ = true; 862 conflict_notification_acknowledged_ = true;
863 content::NotificationService::current()->Notify( 863 content::NotificationService::current()->Notify(
864 chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE, 864 chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE,
865 content::Source<EnumerateModulesModel>(this), 865 content::Source<EnumerateModulesModel>(this),
866 content::NotificationService::NoDetails()); 866 content::NotificationService::NoDetails());
867 } 867 }
868 } 868 }
869 869
870 void EnumerateModulesModel::ScanNow() { 870 void EnumerateModulesModel::ScanNow() {
871 if (scanning_) 871 if (scanning_)
872 return; // A scan is already in progress. 872 return; // A scan is already in progress.
873 873
874 lock->Acquire(); // Balanced in DoneScanning(); 874 lock->Acquire(); // Balanced in DoneScanning();
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 GenerateHash(base::WideToUTF8(module.location), &location); 1073 GenerateHash(base::WideToUTF8(module.location), &location);
1074 GenerateHash(base::WideToUTF8(module.description), &description); 1074 GenerateHash(base::WideToUTF8(module.description), &description);
1075 GenerateHash(base::WideToUTF8(module.digital_signer), &signer); 1075 GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
1076 1076
1077 base::string16 url = 1077 base::string16 url =
1078 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS, 1078 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
1079 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location), 1079 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
1080 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer)); 1080 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
1081 return GURL(base::UTF16ToUTF8(url)); 1081 return GURL(base::UTF16ToUTF8(url));
1082 } 1082 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_notification_types.h ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698