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 a274410215766c95155cc50525037c5b3171a8ec..cf3fd153657cccbcb267453e090cecaee67ae4d5 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
@@ -56,20 +56,12 @@ namespace chromeos { |
namespace { |
-// 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 kAppLaunchSplashDisplay[] = "app-launch-splash"; |
- |
const char* kKnownDisplayTypes[] = { |
- kOobeDisplay, |
- kLoginDisplay, |
- kLockDisplay, |
- kUserAddingDisplay, |
- kAppLaunchSplashDisplay |
+ OobeUI::kOobeDisplay, |
+ OobeUI::kLoginDisplay, |
+ OobeUI::kLockDisplay, |
+ OobeUI::kUserAddingDisplay, |
+ OobeUI::kAppLaunchSplashDisplay |
}; |
const char kStringsJSPath[] = "strings.js"; |
@@ -98,7 +90,7 @@ content::WebUIDataSource* CreateOobeUIDataSource( |
source->AddResourcePath(kDemoUserLoginJSPath, IDR_DEMO_USER_LOGIN_JS); |
return source; |
} |
- if (display_type == kOobeDisplay) { |
+ if (display_type == OobeUI::kOobeDisplay) { |
source->SetDefaultResource(IDR_OOBE_HTML); |
source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); |
} else { |
@@ -124,7 +116,7 @@ std::string GetDisplayType(const GURL& url) { |
kKnownDisplayTypes + arraysize(kKnownDisplayTypes), |
path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) { |
LOG(ERROR) << "Unknown display type '" << path << "'. Setting default."; |
- return kLoginDisplay; |
+ return OobeUI::kLoginDisplay; |
} |
return path; |
} |
@@ -132,6 +124,13 @@ std::string GetDisplayType(const GURL& url) { |
} // namespace |
// static |
+const char OobeUI::kOobeDisplay[] = "oobe"; |
+const char OobeUI::kLoginDisplay[] = "login"; |
+const char OobeUI::kLockDisplay[] = "lock"; |
+const char OobeUI::kUserAddingDisplay[] = "user-adding"; |
+const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash"; |
+ |
+// static |
const char OobeUI::kScreenOobeHIDDetection[] = "hid-detection"; |
const char OobeUI::kScreenOobeNetwork[] = "connect"; |
const char OobeUI::kScreenOobeEula[] = "eula"; |