Introduced switches for Master/Slave bootstrapping process.

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

 // Copyright (c) 2012 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/network_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 186 matching lines @@
   // But after public user session is started, "Terms of Service" dialog is
   // shown. It is a part of OOBE UI screens, so it initiates reload of UI
   // strings in new locale. It also happens asynchronously, that leads to race
   // between "locale change", "input method change" and
   // "EnableLoginLayouts()".  This way EnableLoginLayouts() happens after user
   // input method has been changed, resetting input method to hardware default.
   //
   // 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. Based on our discussion, I thought
I should keep the old logic as is...

However, if we keep this logic, suppose we try to manually set up a new
"ChromeBox for meeting" device. During the OOBE flow, because |is_remora| is
true, EnableLoginLayouts() will not be called, which might violate the case
described above in 1). 

Actually I feel a little confused about this part of logic here. I tried to
hard-code the |enable_layouts| to |false| and tested on the device, and it seems
nothing is affected. It seems the active input methods will be enabled by
SetApplicationLocale() in the network screen anyway and it doesn't matter
whether we enable these input methods here. +alemate@ suggestions?

[Alexander Alekseev, 2015/12/05 00:04:14]

I don't understand this. Do you mean "by connecting USB keyboard"?
I didn't know this is possible. In this case "is_remora" must be true only if
shark-remora OOBE is in progress. If no shark device is connected, is_slave must
be false.
Did you try selecting any non-Latin languages?

-                             ->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(
       "inputMethodsList",
       GetAndActivateLoginKeyboardLayouts(
           application_locale, selected_input_method, enable_layouts).release());
   dict->Set("timezoneList", GetTimezoneList());
 }
 
 void NetworkScreenHandler::Initialize() {
@@ skipping 31 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos