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

Unified Diff: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

Issue 153273002: Include the language (locale) info in the update ping (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments, Unittest 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
index aba78b021978e3502c6ce76721da6157eaa23627..7a87949cb785e06f9b2643f88223f8767315c852 100644
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc
@@ -23,10 +23,10 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/component_updater/component_updater_service.h"
+#include "chrome/browser/omaha_query_params/omaha_query_params.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/omaha_query_params/omaha_query_params.h"
#include "components/nacl/common/nacl_switches.h"
#include "content/public/browser/browser_thread.h"
@@ -80,7 +80,7 @@ void CheckVersionCompatiblity(const base::Version& current_version) {
// PNaCl is packaged as a multi-CRX. This returns the platform-specific
// subdirectory that is part of that multi-CRX.
base::FilePath GetPlatformDir(const base::FilePath& base_path) {
- std::string arch = SanitizeForPath(OmahaQueryParams::getNaclArch());
+ std::string arch = SanitizeForPath(OmahaQueryParams::GetNaclArch());
return base_path.AppendASCII("_platform_specific").AppendASCII(arch);
}
@@ -192,9 +192,9 @@ bool CheckPnaclComponentManifest(const base::DictionaryValue& manifest,
LOG(WARNING) << "'pnacl-arch' field is missing from pnacl-manifest!";
return false;
}
- if (arch.compare(OmahaQueryParams::getNaclArch()) != 0) {
- LOG(WARNING) << "'pnacl-arch' field in manifest is invalid ("
- << arch << " vs " << OmahaQueryParams::getNaclArch() << ")";
+ if (arch.compare(OmahaQueryParams::GetNaclArch()) != 0) {
+ LOG(WARNING) << "'pnacl-arch' field in manifest is invalid (" << arch
+ << " vs " << OmahaQueryParams::GetNaclArch() << ")";
return false;
}
« no previous file with comments | « chrome/browser/component_updater/component_updater_utils.cc ('k') | chrome/browser/extensions/api/runtime/runtime_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698