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

Unified Diff: chrome/browser/search_engines/ui_thread_search_terms_data.cc

Issue 634583003: Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: linux include Created 6 years, 2 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/search_engines/ui_thread_search_terms_data.cc
diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
index f73ba4c67e02e8429afad1fe72f570984a604c74..26366c041bedd8e038820c998cff650b235c4859 100644
--- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -178,17 +178,14 @@ std::string UIThreadSearchTermsData::NTPIsThemedParam() const {
// VersionInfo.
std::string UIThreadSearchTermsData::GoogleImageSearchSource() const {
chrome::VersionInfo version_info;
- if (version_info.is_valid()) {
- std::string version(version_info.Name() + " " + version_info.Version());
- if (version_info.IsOfficialBuild())
- version += " (Official)";
- version += " " + version_info.OSType();
- std::string modifier(version_info.GetVersionStringModifier());
- if (!modifier.empty())
- version += " " + modifier;
- return version;
- }
- return "unknown";
+ std::string version(version_info.Name() + " " + version_info.Version());
+ if (version_info.IsOfficialBuild())
+ version += " (Official)";
+ version += " " + version_info.OSType();
+ std::string modifier(version_info.GetVersionStringModifier());
+ if (!modifier.empty())
+ version += " " + modifier;
+ return version;
}
// static
« no previous file with comments | « chrome/browser/safe_browsing/protocol_manager_helper.cc ('k') | chrome/browser/signin/chrome_signin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698