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

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

Issue 164403002: s/seperator/separator in a couple places (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | 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 #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 888 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 data->SetString("product_name", module->product_name); 899 data->SetString("product_name", module->product_name);
900 data->SetString("description", module->description); 900 data->SetString("description", module->description);
901 data->SetString("version", module->version); 901 data->SetString("version", module->version);
902 data->SetString("digital_signer", module->digital_signer); 902 data->SetString("digital_signer", module->digital_signer);
903 903
904 if (!limited_mode_) { 904 if (!limited_mode_) {
905 // Figure out the possible resolution help string. 905 // Figure out the possible resolution help string.
906 base::string16 actions; 906 base::string16 actions;
907 base::string16 separator = base::ASCIIToWide(" ") + 907 base::string16 separator = base::ASCIIToWide(" ") +
908 l10n_util::GetStringUTF16( 908 l10n_util::GetStringUTF16(
909 IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPERATOR) + 909 IDS_CONFLICTS_CHECK_POSSIBLE_ACTION_SEPARATOR) +
910 base::ASCIIToWide(" "); 910 base::ASCIIToWide(" ");
911 911
912 if (module->recommended_action & ModuleEnumerator::NONE) { 912 if (module->recommended_action & ModuleEnumerator::NONE) {
913 actions = l10n_util::GetStringUTF16( 913 actions = l10n_util::GetStringUTF16(
914 IDS_CONFLICTS_CHECK_INVESTIGATING); 914 IDS_CONFLICTS_CHECK_INVESTIGATING);
915 } 915 }
916 if (module->recommended_action & ModuleEnumerator::UNINSTALL) { 916 if (module->recommended_action & ModuleEnumerator::UNINSTALL) {
917 if (!actions.empty()) 917 if (!actions.empty())
918 actions += separator; 918 actions += separator;
919 actions = l10n_util::GetStringUTF16( 919 actions = l10n_util::GetStringUTF16(
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 GenerateHash(base::WideToUTF8(module.location), &location); 1063 GenerateHash(base::WideToUTF8(module.location), &location);
1064 GenerateHash(base::WideToUTF8(module.description), &description); 1064 GenerateHash(base::WideToUTF8(module.description), &description);
1065 GenerateHash(base::WideToUTF8(module.digital_signer), &signer); 1065 GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
1066 1066
1067 base::string16 url = 1067 base::string16 url =
1068 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS, 1068 l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
1069 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location), 1069 base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
1070 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer)); 1070 base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
1071 return GURL(base::UTF16ToUTF8(url)); 1071 return GURL(base::UTF16ToUTF8(url));
1072 } 1072 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/media_galleries/fileapi/itunes_data_provider_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698