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

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 145294ad281742d7a92493e10b649de4162e075e..a1b971aae501dcdb596c8151ece3395ccd6b3ab9 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -40,8 +40,8 @@
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/url_constants.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
@@ -49,6 +49,7 @@
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.h"
#include "components/onc/onc_constants.h"
#include "components/url_fixer/url_fixer.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/resource_dispatcher_host.h"
@@ -1171,17 +1172,14 @@ base::Value* NetInternalsUI::GetConstants() {
{
base::DictionaryValue* dict = new base::DictionaryValue();
- chrome::VersionInfo version_info;
-
// We have everything we need to send the right values.
- dict->SetString("name", version_info.Name());
- dict->SetString("version", version_info.Version());
- dict->SetString("cl", version_info.LastChange());
- dict->SetString("version_mod",
- chrome::VersionInfo::GetVersionStringModifier());
- dict->SetString("official",
- version_info.IsOfficialBuild() ? "official" : "unofficial");
- dict->SetString("os_type", version_info.OSType());
+ dict->SetString("name", version_info::GetProductName());
+ dict->SetString("version", version_info::GetVersionNumber());
+ dict->SetString("cl", version_info::GetLastChange());
+ dict->SetString("version_mod", chrome::GetChannelString());
+ dict->SetString("official", version_info::IsOfficialBuild() ? "official"
+ : "unofficial");
+ dict->SetString("os_type", version_info::GetOSType());
dict->SetString(
"command_line",
base::CommandLine::ForCurrentProcess()->GetCommandLineString());
« no previous file with comments | « chrome/browser/ui/webui/nacl_ui.cc ('k') | chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698