Made small refactoring of OobeUI.

Made small refactoring of OobeUI.

Each type of UI has its own path chrome://oobe/*.
Path is known during construction of OobeUI, so we can configure OobeUI using
path value.

Also changed location of .oobe_completed file on Linux. 

BUG=252434
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=217623

[ygorshenin1, 2013-07-30 15:06:34]

lgtm

https://codereview.chromium.org/21004005/diff/1/chrome/browser/resources/chro...
File chrome/browser/resources/chromeos/login/display_manager.js (right):

https://codereview.chromium.org/21004005/diff/1/chrome/browser/resources/chro...
chrome/browser/resources/chromeos/login/display_manager.js:113: * @type
{boolean}
nit: maybe string instead of boolean?

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
File chrome/browser/ui/webui/chromeos/login/oobe_ui.cc (right):

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:7: #include <string>
nit: delete <string> inclusion.

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:136: LOG(ERROR) << "Unknown
display type '" + path + "'. Setting default.";
nit: if possible don't intermix IO operators with others. Please, use "<<"
instead of "+".

[dzhioev (left Google), 2013-07-30 16:18:55]

https://codereview.chromium.org/21004005/diff/1/chrome/browser/resources/chro...
File chrome/browser/resources/chromeos/login/display_manager.js (right):

https://codereview.chromium.org/21004005/diff/1/chrome/browser/resources/chro...
chrome/browser/resources/chromeos/login/display_manager.js:113: * @type
{boolean}
On 2013/07/30 15:06:34, ygorshenin1 wrote:
> nit: maybe string instead of boolean?

Done.

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
File chrome/browser/ui/webui/chromeos/login/oobe_ui.cc (right):

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:7: #include <string>
On 2013/07/30 15:06:34, ygorshenin1 wrote:
> nit: delete <string> inclusion.

Done.

https://codereview.chromium.org/21004005/diff/1/chrome/browser/ui/webui/chrom...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:136: LOG(ERROR) << "Unknown
display type '" + path + "'. Setting default.";
On 2013/07/30 15:06:34, ygorshenin1 wrote:
> nit: if possible don't intermix IO operators with others. Please, use "<<"
> instead of "+".

Done.

[commit-bot: I haz the power, 2013-07-30 21:06:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/1012

[commit-bot: I haz the power, 2013-07-31 00:02:23]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Nikita (slow), 2013-07-31 13:27:51]

lgtm

https://codereview.chromium.org/21004005/diff/1012/chrome/browser/ui/webui/ch...
File chrome/browser/ui/webui/chromeos/login/oobe_ui.cc (right):

https://codereview.chromium.org/21004005/diff/1012/chrome/browser/ui/webui/ch...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:55: const char kOobeDisplay[]
= "oobe";
nit: I think short comment may be added here that describes how these are used.

[dzhioev (left Google), 2013-08-01 13:38:09]

https://codereview.chromium.org/21004005/diff/1012/chrome/browser/ui/webui/ch...
File chrome/browser/ui/webui/chromeos/login/oobe_ui.cc (right):

https://codereview.chromium.org/21004005/diff/1012/chrome/browser/ui/webui/ch...
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:55: const char kOobeDisplay[]
= "oobe";
On 2013/07/31 13:27:51, Nikita Kostylev wrote:
> nit: I think short comment may be added here that describes how these are
used.

Done.

[commit-bot: I haz the power, 2013-08-01 13:38:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/17001

[commit-bot: I haz the power, 2013-08-01 13:38:40]

Failed to apply patch for chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
  Hunk #7 FAILED at 192.
  Hunk #8 succeeded at 269 (offset 2 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc.rej

Patch:       chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index
120986ec49051053a3f972fca5d59fddeb738a59..704fed19177106886974fc32e36ec54180350473
100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
-#include <string>
-
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -54,8 +52,19 @@ namespace chromeos {
 
 namespace {
 
-// Path for a stripped down login page that does not have OOBE elements.
-const char kLoginPath[] = "login#login";
+// List of known types of OobeUI. Type added as path in chrome://oobe url, for
+// example chrome://oobe/user-adding.
+const char kOobeDisplay[] = "oobe";
+const char kLoginDisplay[] = "login";
+const char kLockDisplay[] = "lock";
+const char kUserAddingDisplay[] = "user-adding";
+
+const char* kKnownDisplayTypes[] = {
+  kOobeDisplay,
+  kLoginDisplay,
+  kLockDisplay,
+  kUserAddingDisplay
+};
 
 const char kStringsJSPath[] = "strings.js";
 const char kLoginJSPath[] = "login.js";
@@ -86,7 +95,8 @@ bool HandleRequestCallback(
 
 // Creates a WebUIDataSource for chrome://oobe
 content::WebUIDataSource* CreateOobeUIDataSource(
-    const base::DictionaryValue& localized_strings) {
+    const base::DictionaryValue& localized_strings,
+    const std::string& display_type) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIOobeHost);
   source->SetUseJsonJSFormatV2();
@@ -95,35 +105,40 @@ content::WebUIDataSource* CreateOobeUIDataSource(
 
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     source->SetDefaultResource(IDR_DEMO_USER_LOGIN_HTML);
-    source->AddResourcePath(kDemoUserLoginJSPath,
-                            IDR_DEMO_USER_LOGIN_JS);
+    source->AddResourcePath(kDemoUserLoginJSPath, IDR_DEMO_USER_LOGIN_JS);
     return source;
   }
-
-  source->SetDefaultResource(IDR_OOBE_HTML);
-  source->AddResourcePath(kOobeJSPath,
-                          IDR_OOBE_JS);
-  source->AddResourcePath(kLoginPath,
-                          IDR_LOGIN_HTML);
-  source->AddResourcePath(kLoginJSPath,
-                          IDR_LOGIN_JS);
-  source->AddResourcePath(kKeyboardUtilsJSPath,
-                          IDR_KEYBOARD_UTILS_JS);
+  if (display_type == kOobeDisplay) {
+    source->SetDefaultResource(IDR_OOBE_HTML);
+    source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
+  } else {
+    source->SetDefaultResource(IDR_LOGIN_HTML);
+    source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
+  }
+  source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
   source->OverrideContentSecurityPolicyFrameSrc(
       "frame-src chrome://terms/ "
       "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;");
 
   // Serve deferred resources.
-  source->AddResourcePath(kEnrollmentHTMLPath,
-                          IDR_OOBE_ENROLLMENT_HTML);
-  source->AddResourcePath(kEnrollmentCSSPath,
-                          IDR_OOBE_ENROLLMENT_CSS);
-  source->AddResourcePath(kEnrollmentJSPath,
-                          IDR_OOBE_ENROLLMENT_JS);
+  source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
+  source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
+  source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
 
   return source;
 }
 
+std::string GetDisplayType(const GURL& url) {
+  std::string path = url.path().size() ? url.path().substr(1) : "";
+  if (std::find(kKnownDisplayTypes,
+                kKnownDisplayTypes + arraysize(kKnownDisplayTypes),
+                path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
+    LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
+    return kLoginDisplay;
+  }
+  return path;
+}
+
 }  // namespace
 
 // static
@@ -144,8 +159,9 @@ const char OobeUI::kScreenManagedUserCreationFlow[]
 const char OobeUI::kScreenTermsOfService[]  = "terms-of-service";
 const char OobeUI::kScreenWrongHWID[]       = "wrong-hwid";
 
-OobeUI::OobeUI(content::WebUI* web_ui)
+OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
+      core_handler_(NULL),
       update_screen_handler_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
@@ -161,6 +177,7 @@ OobeUI::OobeUI(content::WebUI* web_ui)
       kiosk_app_menu_handler_(NULL),
       current_screen_(SCREEN_UNKNOWN),
       ready_(false) {
+  display_type_ = GetDisplayType(url);
   InitializeScreenMaps();
 
   network_state_informer_ = new NetworkStateInformer();
@@ -175,9 +192,11 @@ OobeUI::OobeUI(content::WebUI* web_ui)
   update_screen_handler_ = new UpdateScreenHandler();
   AddScreenHandler(update_screen_handler_);
 
-  NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
-  network_screen_actor_ = network_screen_handler;
-  AddScreenHandler(network_screen_handler);
+  if (display_type_ == kOobeDisplay) {
+    NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
+    network_screen_actor_ = network_screen_handler;
+    AddScreenHandler(network_screen_handler);
+  }
 
   EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
   eula_screen_actor_ = eula_screen_handler;
@@ -250,7 +269,8 @@ OobeUI::OobeUI(content::WebUI* web_ui)
 
   // Set up the chrome://oobe/ source.
   content::WebUIDataSource::Add(profile,
-                                CreateOobeUIDataSource(localized_strings));
+                                CreateOobeUIDataSource(localized_strings,
+                                                       display_type_));
 
   // Set up the chrome://userimage/ source.
   options::UserImageSource* user_image_source =

[commit-bot: I haz the power, 2013-08-01 14:04:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/22001

[commit-bot: I haz the power, 2013-08-01 14:29:04]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-08-01 14:33:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/45001

[commit-bot: I haz the power, 2013-08-01 15:52:49]

Retried try job too often on linux_chromeos for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-08-05 13:44:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/45001

[commit-bot: I haz the power, 2013-08-05 13:44:26]

Failed to apply patch for chrome/browser/ui/webui/chromeos/login/oobe_ui.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
  Hunk #5 FAILED at 159.
  Hunk #6 succeeded at 178 (offset 2 lines).
  Hunk #7 succeeded at 195 with fuzz 2 (offset 4 lines).
  Hunk #8 succeeded at 274 (offset 4 lines).
  1 out of 8 hunks FAILED -- saving rejects to file
chrome/browser/ui/webui/chromeos/login/oobe_ui.cc.rej

Patch:       chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index
a018ffaac425bc35b2c3c2d8e974395ad3a7a774..6a993a7a07a152d7ff5a5b2a70f529f0bab4c83b
100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
-#include <string>
-
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -54,8 +52,19 @@ namespace chromeos {
 
 namespace {
 
-// Path for a stripped down login page that does not have OOBE elements.
-const char kLoginPath[] = "login#login";
+// List of known types of OobeUI. Type added as path in chrome://oobe url, for
+// example chrome://oobe/user-adding.
+const char kOobeDisplay[] = "oobe";
+const char kLoginDisplay[] = "login";
+const char kLockDisplay[] = "lock";
+const char kUserAddingDisplay[] = "user-adding";
+
+const char* kKnownDisplayTypes[] = {
+  kOobeDisplay,
+  kLoginDisplay,
+  kLockDisplay,
+  kUserAddingDisplay
+};
 
 const char kStringsJSPath[] = "strings.js";
 const char kLoginJSPath[] = "login.js";
@@ -86,7 +95,8 @@ bool HandleRequestCallback(
 
 // Creates a WebUIDataSource for chrome://oobe
 content::WebUIDataSource* CreateOobeUIDataSource(
-    const base::DictionaryValue& localized_strings) {
+    const base::DictionaryValue& localized_strings,
+    const std::string& display_type) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIOobeHost);
   source->SetUseJsonJSFormatV2();
@@ -95,35 +105,40 @@ content::WebUIDataSource* CreateOobeUIDataSource(
 
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     source->SetDefaultResource(IDR_DEMO_USER_LOGIN_HTML);
-    source->AddResourcePath(kDemoUserLoginJSPath,
-                            IDR_DEMO_USER_LOGIN_JS);
+    source->AddResourcePath(kDemoUserLoginJSPath, IDR_DEMO_USER_LOGIN_JS);
     return source;
   }
-
-  source->SetDefaultResource(IDR_OOBE_HTML);
-  source->AddResourcePath(kOobeJSPath,
-                          IDR_OOBE_JS);
-  source->AddResourcePath(kLoginPath,
-                          IDR_LOGIN_HTML);
-  source->AddResourcePath(kLoginJSPath,
-                          IDR_LOGIN_JS);
-  source->AddResourcePath(kKeyboardUtilsJSPath,
-                          IDR_KEYBOARD_UTILS_JS);
+  if (display_type == kOobeDisplay) {
+    source->SetDefaultResource(IDR_OOBE_HTML);
+    source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
+  } else {
+    source->SetDefaultResource(IDR_LOGIN_HTML);
+    source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
+  }
+  source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
   source->OverrideContentSecurityPolicyFrameSrc(
       "frame-src chrome://terms/ "
       "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;");
 
   // Serve deferred resources.
-  source->AddResourcePath(kEnrollmentHTMLPath,
-                          IDR_OOBE_ENROLLMENT_HTML);
-  source->AddResourcePath(kEnrollmentCSSPath,
-                          IDR_OOBE_ENROLLMENT_CSS);
-  source->AddResourcePath(kEnrollmentJSPath,
-                          IDR_OOBE_ENROLLMENT_JS);
+  source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
+  source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
+  source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
 
   return source;
 }
 
+std::string GetDisplayType(const GURL& url) {
+  std::string path = url.path().size() ? url.path().substr(1) : "";
+  if (std::find(kKnownDisplayTypes,
+                kKnownDisplayTypes + arraysize(kKnownDisplayTypes),
+                path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
+    LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
+    return kLoginDisplay;
+  }
+  return path;
+}
+
 }  // namespace
 
 // static
@@ -144,8 +159,9 @@ const char OobeUI::kScreenManagedUserCreationFlow[]
 const char OobeUI::kScreenTermsOfService[]  = "terms-of-service";
 const char OobeUI::kScreenWrongHWID[]       = "wrong-hwid";
 
-OobeUI::OobeUI(content::WebUI* web_ui)
+OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
+      core_handler_(NULL),
       update_screen_handler_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
@@ -161,6 +177,7 @@ OobeUI::OobeUI(content::WebUI* web_ui)
       kiosk_app_menu_handler_(NULL),
       current_screen_(SCREEN_UNKNOWN),
       ready_(false) {
+  display_type_ = GetDisplayType(url);
   InitializeScreenMaps();
 
   network_state_informer_ = new NetworkStateInformer();
@@ -175,10 +192,12 @@ OobeUI::OobeUI(content::WebUI* web_ui)
   update_screen_handler_ = new UpdateScreenHandler();
   AddScreenHandler(update_screen_handler_);
 
-  NetworkScreenHandler* network_screen_handler =
-      new NetworkScreenHandler(core_handler_);
-  network_screen_actor_ = network_screen_handler;
-  AddScreenHandler(network_screen_handler);
+  if (display_type_ == kOobeDisplay) {
+    NetworkScreenHandler* network_screen_handler =
+        new NetworkScreenHandler(core_handler_);
+    network_screen_actor_ = network_screen_handler;
+    AddScreenHandler(network_screen_handler);
+  }
 
   EulaScreenHandler* eula_screen_handler = new
EulaScreenHandler(core_handler_);
   eula_screen_actor_ = eula_screen_handler;
@@ -252,7 +271,8 @@ OobeUI::OobeUI(content::WebUI* web_ui)
 
   // Set up the chrome://oobe/ source.
   content::WebUIDataSource::Add(profile,
-                                CreateOobeUIDataSource(localized_strings));
+                                CreateOobeUIDataSource(localized_strings,
+                                                       display_type_));
 
   // Set up the chrome://userimage/ source.
   options::UserImageSource* user_image_source =

[Nikita (slow), 2013-08-05 13:45:00]

I think LoginSigninTest.WebUIVisible failing is related to this CL.

[commit-bot: I haz the power, 2013-08-14 16:35:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dzhioev@chromium.org/21004005/80001

[commit-bot: I haz the power, 2013-08-14 20:03:23]

Change committed as 217623