Chrome OS Gaia: Set param 'chrometype' for MinuteMaid (chromebox, chromebase or chromebook)

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/chromeos/chromeos_utils.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/screens/network_error.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ skipping 199 matching lines @@
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   if (StartupUtils::IsWebviewSigninEnabled()) {
     params.SetBoolean("useMinuteMaid", true);
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     std::string enterprise_domain(connector->GetEnterpriseDomain());
     if (!enterprise_domain.empty())
       params.SetString("enterpriseDomain", enterprise_domain);
+    params.SetString("chromeType", GetChromeDeviceTypeForMinuteMaid());

[Nikita (slow), 2015/02/25 09:28:43]

I suggest set this parameter only if device ID string is not empty.

[Roman Sorokin (ftl), 2015/02/25 10:28:39]

Done.

     params.SetString("clientId",
                      GaiaUrls::GetInstance()->oauth2_chrome_client_id());
     if (!command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) {
       command_line->AppendSwitchASCII(switches::kGaiaEndpointChromeOS,
                                       kMinuteMaidPath);
     }
   }
 
   const GURL gaia_url =
       command_line->HasSwitch(::switches::kGaiaUrl)
@@ skipping 539 matching lines @@
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 }  // namespace chromeos