Skip to content

GitLab

T
tangled
Commit 6b1a7bd5 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot
Browse files
Options

Rename kNameField to be unique (browser/ui) 

When building using Jumbo unnamed namespaces gets merged
and variables with the same name conflict. This happens
for the variables kNameField in webui/certficates_handler.cc
and webui/inspect_ui.cc.

This commit solves the issue by renaming the variables to
something more file specific. It also renames other variables
in the same namespace, so the naming is locally consistent.

Bug: 773275
Change-Id: I0b900803f4f84c058c43e1b5b3f395c8e14774f9
Reviewed-on: https://chromium-review.googlesource.com/1107929
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Reviewed-by: default avatarcalamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569975}
parent e32cbb07
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 80 deletions
chrome/browser/ui/webui/certificates_handler.cc
View file @ 6b1a7bd5
...@@ -52,22 +52,22 @@ using base::UTF8ToUTF16; ...@@ -52,22 +52,22 @@ using base::UTF8ToUTF16;
namespace { namespace {
// Field names for communicating certificate info to JS. // Field names for communicating certificate info to JS.
static const char kEmailField[] = "email"; static const char kCertificatesHandlerEmailField[] = "email";
static const char kExtractableField[] = "extractable"; static const char kCertificatesHandlerExtractableField[] = "extractable";
static const char kKeyField[] = "id"; static const char kCertificatesHandlerKeyField[] = "id";
static const char kNameField[] = "name"; static const char kCertificatesHandlerNameField[] = "name";
static const char kObjSignField[] = "objSign"; static const char kCertificatesHandlerObjSignField[] = "objSign";
static const char kPolicyField[] = "policy"; static const char kCertificatesHandlerPolicyField[] = "policy";
static const char kReadonlyField[] = "readonly"; static const char kCertificatesHandlerReadonlyField[] = "readonly";
static const char kSslField[] = "ssl"; static const char kCertificatesHandlerSslField[] = "ssl";
static const char kSubnodesField[] = "subnodes"; static const char kCertificatesHandlerSubnodesField[] = "subnodes";
static const char kUntrustedField[] = "untrusted"; static const char kCertificatesHandlerUntrustedField[] = "untrusted";
// Field names for communicating erros to JS. // Field names for communicating erros to JS.
static const char kCertificateErrors[] = "certificateErrors"; static const char kCertificatesHandlerCertificateErrors[] = "certificateErrors";
static const char kErrorDescription[] = "description"; static const char kCertificatesHandlerErrorDescription[] = "description";
static const char kErrorField[] = "error"; static const char kCertificatesHandlerErrorField[] = "error";
static const char kErrorTitle[] = "title"; static const char kCertificatesHandlerErrorTitle[] = "title";
// Enumeration of different callers of SelectFile. (Start counting at 1 so // Enumeration of different callers of SelectFile. (Start counting at 1 so
// if SelectFile is accidentally called with params=NULL it won't match any.) // if SelectFile is accidentally called with params=NULL it won't match any.)
...@@ -97,8 +97,8 @@ struct DictionaryIdComparator { ...@@ -97,8 +97,8 @@ struct DictionaryIdComparator {
DCHECK(b_is_dictionary); DCHECK(b_is_dictionary);
base::string16 a_str; base::string16 a_str;
base::string16 b_str; base::string16 b_str;
a_dict->GetString(kNameField, &a_str); a_dict->GetString(kCertificatesHandlerNameField, &a_str);
b_dict->GetString(kNameField, &b_str); b_dict->GetString(kCertificatesHandlerNameField, &b_str);
if (collator_ == NULL) if (collator_ == NULL)
return a_str < b_str; return a_str < b_str;
return base::i18n::CompareString16WithCollator(*collator_, a_str, b_str) == return base::i18n::CompareString16WithCollator(*collator_, a_str, b_str) ==
...@@ -496,13 +496,13 @@ void CertificatesHandler::HandleGetCATrust(const base::ListValue* args) { ...@@ -496,13 +496,13 @@ void CertificatesHandler::HandleGetCATrust(const base::ListValue* args) {
std::unique_ptr<base::DictionaryValue> ca_trust_info( std::unique_ptr<base::DictionaryValue> ca_trust_info(
new base::DictionaryValue); new base::DictionaryValue);
ca_trust_info->SetBoolean( ca_trust_info->SetBoolean(
kSslField, kCertificatesHandlerSslField,
static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_SSL)); static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_SSL));
ca_trust_info->SetBoolean( ca_trust_info->SetBoolean(
kEmailField, kCertificatesHandlerEmailField,
static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_EMAIL)); static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_EMAIL));
ca_trust_info->SetBoolean( ca_trust_info->SetBoolean(
kObjSignField, kCertificatesHandlerObjSignField,
static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_OBJ_SIGN)); static_cast<bool>(trust_bits & net::NSSCertDatabase::TRUSTED_OBJ_SIGN));
ResolveCallback(*ca_trust_info); ResolveCallback(*ca_trust_info);
} }
...@@ -1045,8 +1045,8 @@ void CertificatesHandler::PopulateTree( ...@@ -1045,8 +1045,8 @@ void CertificatesHandler::PopulateTree(
i != map.end(); ++i) { i != map.end(); ++i) {
// Populate first level (org name). // Populate first level (org name).
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue); std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
dict->SetString(kKeyField, OrgNameToId(i->first)); dict->SetString(kCertificatesHandlerKeyField, OrgNameToId(i->first));
dict->SetString(kNameField, i->first); dict->SetString(kCertificatesHandlerNameField, i->first);
// Populate second level (certs). // Populate second level (certs).
auto subnodes = std::make_unique<base::ListValue>(); auto subnodes = std::make_unique<base::ListValue>();
...@@ -1056,33 +1056,35 @@ void CertificatesHandler::PopulateTree( ...@@ -1056,33 +1056,35 @@ void CertificatesHandler::PopulateTree(
std::unique_ptr<base::DictionaryValue> cert_dict( std::unique_ptr<base::DictionaryValue> cert_dict(
new base::DictionaryValue); new base::DictionaryValue);
CERTCertificate* cert = org_cert_it->get(); CERTCertificate* cert = org_cert_it->get();
cert_dict->SetString(kKeyField, cert_id_map_->CertToId(cert)); cert_dict->SetString(kCertificatesHandlerKeyField,
cert_id_map_->CertToId(cert));
cert_dict->SetString( cert_dict->SetString(
kNameField, certificate_manager_model_->GetColumnText( kCertificatesHandlerNameField,
cert, CertificateManagerModel::COL_SUBJECT_NAME)); certificate_manager_model_->GetColumnText(
cert, CertificateManagerModel::COL_SUBJECT_NAME));
cert_dict->SetBoolean( cert_dict->SetBoolean(
kReadonlyField, kCertificatesHandlerReadonlyField,
certificate_manager_model_->cert_db()->IsReadOnly(cert)); certificate_manager_model_->cert_db()->IsReadOnly(cert));
// Policy-installed certificates with web trust are trusted. // Policy-installed certificates with web trust are trusted.
bool policy_trusted = bool policy_trusted =
IsPolicyInstalledWithWebTrust(web_trust_certs, cert); IsPolicyInstalledWithWebTrust(web_trust_certs, cert);
cert_dict->SetBoolean( cert_dict->SetBoolean(
kUntrustedField, kCertificatesHandlerUntrustedField,
!policy_trusted && !policy_trusted &&
certificate_manager_model_->cert_db()->IsUntrusted(cert)); certificate_manager_model_->cert_db()->IsUntrusted(cert));
cert_dict->SetBoolean(kPolicyField, policy_trusted); cert_dict->SetBoolean(kCertificatesHandlerPolicyField, policy_trusted);
// TODO(hshi): This should be determined by testing for PKCS #11 // TODO(hshi): This should be determined by testing for PKCS #11
// CKA_EXTRACTABLE attribute. We may need to use the NSS function // CKA_EXTRACTABLE attribute. We may need to use the NSS function
// PK11_ReadRawAttribute to do that. // PK11_ReadRawAttribute to do that.
cert_dict->SetBoolean( cert_dict->SetBoolean(
kExtractableField, kCertificatesHandlerExtractableField,
!certificate_manager_model_->IsHardwareBacked(cert)); !certificate_manager_model_->IsHardwareBacked(cert));
// TODO(mattm): Other columns. // TODO(mattm): Other columns.
subnodes->Append(std::move(cert_dict)); subnodes->Append(std::move(cert_dict));
} }
std::sort(subnodes->begin(), subnodes->end(), comparator); std::sort(subnodes->begin(), subnodes->end(), comparator);
dict->Set(kSubnodesField, std::move(subnodes)); dict->Set(kCertificatesHandlerSubnodesField, std::move(subnodes));
nodes->Append(std::move(dict)); nodes->Append(std::move(dict));
} }
std::sort(nodes->begin(), nodes->end(), comparator); std::sort(nodes->begin(), nodes->end(), comparator);
...@@ -1106,8 +1108,8 @@ void CertificatesHandler::RejectCallback(const base::Value& response) { ...@@ -1106,8 +1108,8 @@ void CertificatesHandler::RejectCallback(const base::Value& response) {
void CertificatesHandler::RejectCallbackWithError(const std::string& title, void CertificatesHandler::RejectCallbackWithError(const std::string& title,
const std::string& error) { const std::string& error) {
std::unique_ptr<base::DictionaryValue> error_info(new base::DictionaryValue); std::unique_ptr<base::DictionaryValue> error_info(new base::DictionaryValue);
error_info->SetString(kErrorTitle, title); error_info->SetString(kCertificatesHandlerErrorTitle, title);
error_info->SetString(kErrorDescription, error); error_info->SetString(kCertificatesHandlerErrorDescription, error);
RejectCallback(*error_info); RejectCallback(*error_info);
} }
...@@ -1130,16 +1132,19 @@ void CertificatesHandler::RejectCallbackWithImportError( ...@@ -1130,16 +1132,19 @@ void CertificatesHandler::RejectCallbackWithImportError(
for (size_t i = 0; i < not_imported.size(); ++i) { for (size_t i = 0; i < not_imported.size(); ++i) {
const net::NSSCertDatabase::ImportCertFailure& failure = not_imported[i]; const net::NSSCertDatabase::ImportCertFailure& failure = not_imported[i];
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue); std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
dict->SetString(kNameField, x509_certificate_model::GetSubjectDisplayName( dict->SetString(kCertificatesHandlerNameField,
failure.certificate.get())); x509_certificate_model::GetSubjectDisplayName(
dict->SetString(kErrorField, NetErrorToString(failure.net_error)); failure.certificate.get()));
dict->SetString(kCertificatesHandlerErrorField,
NetErrorToString(failure.net_error));
cert_error_list->Append(std::move(dict)); cert_error_list->Append(std::move(dict));
} }
std::unique_ptr<base::DictionaryValue> error_info(new base::DictionaryValue); std::unique_ptr<base::DictionaryValue> error_info(new base::DictionaryValue);
error_info->SetString(kErrorTitle, title); error_info->SetString(kCertificatesHandlerErrorTitle, title);
error_info->SetString(kErrorDescription, error); error_info->SetString(kCertificatesHandlerErrorDescription, error);
error_info->Set(kCertificateErrors, std::move(cert_error_list)); error_info->Set(kCertificatesHandlerCertificateErrors,
std::move(cert_error_list));
RejectCallback(*error_info); RejectCallback(*error_info);
} }
......
chrome/browser/ui/webui/inspect_ui.cc
View file @ 6b1a7bd5
...@@ -38,41 +38,42 @@ using content::WebUIMessageHandler; ...@@ -38,41 +38,42 @@ using content::WebUIMessageHandler;
namespace { namespace {
const char kInitUICommand[] = "init-ui"; const char kInspectUiInitUICommand[] = "init-ui";
const char kInspectCommand[] = "inspect"; const char kInspectUiInspectCommand[] = "inspect";
const char kInspectFallbackCommand[] = "inspect-fallback"; const char kInspectUiInspectFallbackCommand[] = "inspect-fallback";
const char kInspectAdditionalCommand[] = "inspect-additional"; const char kInspectUiInspectAdditionalCommand[] = "inspect-additional";
const char kActivateCommand[] = "activate"; const char kInspectUiActivateCommand[] = "activate";
const char kCloseCommand[] = "close"; const char kInspectUiCloseCommand[] = "close";
const char kReloadCommand[] = "reload"; const char kInspectUiReloadCommand[] = "reload";
const char kOpenCommand[] = "open"; const char kInspectUiOpenCommand[] = "open";
const char kInspectBrowser[] = "inspect-browser"; const char kInspectUiInspectBrowser[] = "inspect-browser";
const char kLocalHost[] = "localhost"; const char kInspectUiLocalHost[] = "localhost";
const char kDiscoverUsbDevicesEnabledCommand[] = const char kInspectUiDiscoverUsbDevicesEnabledCommand[] =
"set-discover-usb-devices-enabled"; "set-discover-usb-devices-enabled";
const char kPortForwardingEnabledCommand[] = const char kInspectUiPortForwardingEnabledCommand[] =
"set-port-forwarding-enabled"; "set-port-forwarding-enabled";
const char kPortForwardingConfigCommand[] = "set-port-forwarding-config"; const char kInspectUiPortForwardingConfigCommand[] =
const char kDiscoverTCPTargetsEnabledCommand[] = "set-port-forwarding-config";
const char kInspectUiDiscoverTCPTargetsEnabledCommand[] =
"set-discover-tcp-targets-enabled"; "set-discover-tcp-targets-enabled";
const char kTCPDiscoveryConfigCommand[] = "set-tcp-discovery-config"; const char kInspectUiTCPDiscoveryConfigCommand[] = "set-tcp-discovery-config";
const char kOpenNodeFrontendCommand[] = "open-node-frontend"; const char kInspectUiOpenNodeFrontendCommand[] = "open-node-frontend";
const char kPortForwardingDefaultPort[] = "8080"; const char kInspectUiPortForwardingDefaultPort[] = "8080";
const char kPortForwardingDefaultLocation[] = "localhost:8080"; const char kInspectUiPortForwardingDefaultLocation[] = "localhost:8080";
const char kNameField[] = "name"; const char kInspectUiNameField[] = "name";
const char kUrlField[] = "url"; const char kInspectUiUrlField[] = "url";
const char kIsAdditionalField[] = "isAdditional"; const char kInspectUiIsAdditionalField[] = "isAdditional";
void GetUiDevToolsTargets(base::ListValue& targets) { void GetUiDevToolsTargets(base::ListValue& targets) {
for (const auto& client_pair : for (const auto& client_pair :
ui_devtools::UiDevToolsServer::GetClientNamesAndUrls()) { ui_devtools::UiDevToolsServer::GetClientNamesAndUrls()) {
auto target_data = std::make_unique<base::DictionaryValue>(); auto target_data = std::make_unique<base::DictionaryValue>();
target_data->SetString(kNameField, client_pair.first); target_data->SetString(kInspectUiNameField, client_pair.first);
target_data->SetString(kUrlField, client_pair.second); target_data->SetString(kInspectUiUrlField, client_pair.second);
target_data->SetBoolean(kIsAdditionalField, true); target_data->SetBoolean(kInspectUiIsAdditionalField, true);
targets.Append(std::move(target_data)); targets.Append(std::move(target_data));
} }
} }
...@@ -111,69 +112,69 @@ class InspectMessageHandler : public WebUIMessageHandler { ...@@ -111,69 +112,69 @@ class InspectMessageHandler : public WebUIMessageHandler {
void InspectMessageHandler::RegisterMessages() { void InspectMessageHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kInitUICommand, kInspectUiInitUICommand,
base::BindRepeating(&InspectMessageHandler::HandleInitUICommand, base::BindRepeating(&InspectMessageHandler::HandleInitUICommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kInspectCommand, kInspectUiInspectCommand,
base::BindRepeating(&InspectMessageHandler::HandleInspectCommand, base::BindRepeating(&InspectMessageHandler::HandleInspectCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kInspectFallbackCommand, kInspectUiInspectFallbackCommand,
base::BindRepeating(&InspectMessageHandler::HandleInspectFallbackCommand, base::BindRepeating(&InspectMessageHandler::HandleInspectFallbackCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kInspectAdditionalCommand, kInspectUiInspectAdditionalCommand,
base::BindRepeating( base::BindRepeating(
&InspectMessageHandler::HandleInspectAdditionalCommand, &InspectMessageHandler::HandleInspectAdditionalCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kActivateCommand, kInspectUiActivateCommand,
base::BindRepeating(&InspectMessageHandler::HandleActivateCommand, base::BindRepeating(&InspectMessageHandler::HandleActivateCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kCloseCommand, kInspectUiCloseCommand,
base::BindRepeating(&InspectMessageHandler::HandleCloseCommand, base::BindRepeating(&InspectMessageHandler::HandleCloseCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kDiscoverUsbDevicesEnabledCommand, kInspectUiDiscoverUsbDevicesEnabledCommand,
base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged, base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged,
base::Unretained(this), base::Unretained(this),
&prefs::kDevToolsDiscoverUsbDevicesEnabled[0])); &prefs::kDevToolsDiscoverUsbDevicesEnabled[0]));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kPortForwardingEnabledCommand, kInspectUiPortForwardingEnabledCommand,
base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged, base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged,
base::Unretained(this), base::Unretained(this),
&prefs::kDevToolsPortForwardingEnabled[0])); &prefs::kDevToolsPortForwardingEnabled[0]));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kPortForwardingConfigCommand, kInspectUiPortForwardingConfigCommand,
base::BindRepeating( base::BindRepeating(
&InspectMessageHandler::HandlePortForwardingConfigCommand, &InspectMessageHandler::HandlePortForwardingConfigCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kDiscoverTCPTargetsEnabledCommand, kInspectUiDiscoverTCPTargetsEnabledCommand,
base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged, base::BindRepeating(&InspectMessageHandler::HandleBooleanPrefChanged,
base::Unretained(this), base::Unretained(this),
&prefs::kDevToolsDiscoverTCPTargetsEnabled[0])); &prefs::kDevToolsDiscoverTCPTargetsEnabled[0]));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kTCPDiscoveryConfigCommand, kInspectUiTCPDiscoveryConfigCommand,
base::BindRepeating( base::BindRepeating(
&InspectMessageHandler::HandleTCPDiscoveryConfigCommand, &InspectMessageHandler::HandleTCPDiscoveryConfigCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kOpenNodeFrontendCommand, kInspectUiOpenNodeFrontendCommand,
base::BindRepeating(&InspectMessageHandler::HandleOpenNodeFrontendCommand, base::BindRepeating(&InspectMessageHandler::HandleOpenNodeFrontendCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kReloadCommand, kInspectUiReloadCommand,
base::BindRepeating(&InspectMessageHandler::HandleReloadCommand, base::BindRepeating(&InspectMessageHandler::HandleReloadCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kOpenCommand, kInspectUiOpenCommand,
base::BindRepeating(&InspectMessageHandler::HandleOpenCommand, base::BindRepeating(&InspectMessageHandler::HandleOpenCommand,
base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
kInspectBrowser, kInspectUiInspectBrowser,
base::BindRepeating(&InspectMessageHandler::HandleInspectBrowserCommand, base::BindRepeating(&InspectMessageHandler::HandleInspectBrowserCommand,
base::Unretained(this))); base::Unretained(this)));
} }
...@@ -437,7 +438,7 @@ void InspectUI::InspectBrowserWithCustomFrontend( ...@@ -437,7 +438,7 @@ void InspectUI::InspectBrowserWithCustomFrontend(
const GURL& frontend_url) { const GURL& frontend_url) {
if (!frontend_url.SchemeIs(content::kChromeUIScheme) && if (!frontend_url.SchemeIs(content::kChromeUIScheme) &&
!frontend_url.SchemeIs(content::kChromeDevToolsScheme) && !frontend_url.SchemeIs(content::kChromeDevToolsScheme) &&
frontend_url.host() != kLocalHost) { frontend_url.host() != kInspectUiLocalHost) {
return; return;
} }
...@@ -608,8 +609,8 @@ void InspectUI::SetPortForwardingDefaults() { ...@@ -608,8 +609,8 @@ void InspectUI::SetPortForwardingDefaults() {
return; return;
base::DictionaryValue default_config; base::DictionaryValue default_config;
default_config.SetString( default_config.SetString(kInspectUiPortForwardingDefaultPort,
kPortForwardingDefaultPort, kPortForwardingDefaultLocation); kInspectUiPortForwardingDefaultLocation);
prefs->Set(prefs::kDevToolsPortForwardingConfig, default_config); prefs->Set(prefs::kDevToolsPortForwardingConfig, default_config);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment