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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index e4187a096366cf14c2f01ba9f758ba3174093900..3d77e862c595b8b4febc3d7d0825db17b11ec8fb 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -28,7 +28,7 @@
#include "chrome/browser/io_thread.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "chrome/browser/ui/webui/signin/inline_login_ui.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/chromeos_switches.h"
@@ -38,6 +38,7 @@
#include "chromeos/system/version_loader.h"
#include "components/login/localized_values_builder.h"
#include "components/user_manager/user_manager.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
#include "google_apis/gaia/gaia_auth_util.h"
@@ -290,14 +291,13 @@ void GaiaScreenHandler::LoadGaiaWithVersion(
if (!enterprise_domain.empty())
params.SetString("enterpriseDomain", enterprise_domain);
- chrome::VersionInfo version_info;
params.SetString("chromeType", GetChromeType());
params.SetString("clientId",
GaiaUrls::GetInstance()->oauth2_chrome_client_id());
- params.SetString("clientVersion", version_info.Version());
+ params.SetString("clientVersion", version_info::GetVersionNumber());
if (!platform_version.empty())
params.SetString("platformVersion", platform_version);
- params.SetString("releaseChannel", chrome::VersionInfo::GetChannelString());
+ params.SetString("releaseChannel", chrome::GetChannelString());
params.SetString("endpointGen", kEndpointGen);
std::string email_domain;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698