Extract common OOBE controller code from oobe.js/login.js.

chrome/browser/ui/webui/chromeos/login/oobe_ui.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/oobe_ui.h"
 
 #include <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
 namespace {
 
 // Path for a stripped down login page that does not have OOBE elements.
 const char kLoginPath[] = "login";
 
 // Path for the enterprise enrollment gaia page hosting.
 const char kEnterpriseEnrollmentGaiaLoginPath[] = "gaialogin";
 
 const char kStringsJSPath[] = "strings.js";
 const char kLoginJSPath[] = "login.js";
+const char kOobeCommonJSPath[] = "oobe_common.js";

[dzhioev (left Google), 2013/04/16 10:47:48]

I think it is not needed.

[dconnelly, 2013/04/16 11:11:22]

Done.

 const char kOobeJSPath[] = "oobe.js";
 const char kDemoUserLoginJSPath[] = "demo_user_login.js";
 
 // Filter handler of chrome://oobe data source.
 bool HandleRequestCallback(
     const std::string& path,
     const content::WebUIDataSource::GotDataCallback& callback) {
   if (UserManager::Get()->IsUserLoggedIn() &&
       !UserManager::Get()->IsLoggedInAsStub() &&
       !ScreenLocker::default_screen_locker()) {
@@ skipping 16 matching lines @@
   source->SetJsonPath(kStringsJSPath);
 
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     source->SetDefaultResource(IDR_DEMO_USER_LOGIN_HTML);
     source->AddResourcePath(kDemoUserLoginJSPath,
                             IDR_DEMO_USER_LOGIN_JS);
     return source;
   }
 
   source->SetDefaultResource(IDR_OOBE_HTML);
+  source->AddResourcePath(kOobeCommonJSPath,

[dzhioev (left Google), 2013/04/16 10:47:48]

Not needed to.

[dconnelly, 2013/04/16 11:11:22]

Done.

+                          IDR_OOBE_COMMON_JS);
   source->AddResourcePath(kOobeJSPath,
                           IDR_OOBE_JS);
   source->AddResourcePath(kLoginPath,
                           IDR_LOGIN_HTML);
   source->AddResourcePath(kLoginJSPath,
                           IDR_LOGIN_JS);
   source->AddResourcePath(kEnterpriseEnrollmentGaiaLoginPath,
                           IDR_GAIA_LOGIN_HTML);
   source->OverrideContentSecurityPolicyFrameSrc(
       "frame-src chrome://terms/ "
@@ skipping 282 matching lines @@
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   if (screen_ids_.count(screen)) {
     current_screen_ = screen_ids_[screen];
   } else {
     NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
     current_screen_ = SCREEN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos