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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 1492043002: Introduced switches for Master/Slave bootstrapping process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reverted unnecessary changes back. Created 5 years 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/chromeos/login/network_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 195b03213f873f4002d77e469205f165d6c99259..40b251b851c18966ae26f53243db1a0005fd72a9 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -204,17 +204,15 @@ void NetworkScreenHandler::GetAdditionalParameters(
// So we need to disable activation of login layouts if we are already in
// active user session.
//
- // 3) This is the bootstrapping process for the remora device. The locale &
- // input of the remora device is set up by a shark device. In this case we
+ // 3) This is the bootstrapping process for the "Slave" device. The locale &
+ // input of the "Slave" device is set up by a "Master" device. In this case we
// don't want EnableLoginLayout() to reset the input method to the hardware
// default method.
- const bool is_remora = g_browser_process->platform_part()
achuithb 2015/12/04 09:14:11 Shouldn't we keep this logic as well?
xdai1 2015/12/04 19:04:15 Yes, probably I should not delete this logic. Base
Alexander Alekseev 2015/12/05 00:04:14 I don't understand this. Do you mean "by connectin
- ->browser_policy_connector_chromeos()
- ->GetDeviceCloudPolicyManager()
- ->IsRemoraRequisition();
+ const bool is_slave = base::CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kOobeBootstrappingSlave);
const bool enable_layouts =
- !user_manager::UserManager::Get()->IsUserLoggedIn() && !is_remora;
+ !user_manager::UserManager::Get()->IsUserLoggedIn() && !is_slave;
achuithb 2015/12/04 09:14:11 && !is_remora as well?
dict->Set("languageList", language_list.release());
dict->Set(

Powered by Google App Engine
This is Rietveld 408576698