Skip to content

GitLab

T
tangled
Commit 200f6674 authored by oshima@chromium.org's avatar oshima@chromium.org
Browse files
Options

more logs in login.js|html 

TBR=xiyuan@chromium.org
BUG=chromium-os:26646
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9580039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124853 0039d316-1c4b-4281-b951-d872f2087c98
parent 9226938b
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 10 deletions
chrome/browser/resources/chromeos/login/login.html
View file @ 200f6674
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
<link rel="stylesheet" href="screen_gaia_signin.css"> <link rel="stylesheet" href="screen_gaia_signin.css">
<link rel="stylesheet" href="screen_error_message.css"> <link rel="stylesheet" href="screen_error_message.css">
<link rel="stylesheet" href="user_pod_row.css"> <link rel="stylesheet" href="user_pod_row.css">
<script>
console.log("## login.html before script");
</script>
<script src="chrome://resources/js/cr.js"></script> <script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/cr/event_target.js"></script> <script src="chrome://resources/js/cr/event_target.js"></script>
<script src="chrome://resources/js/cr/ui.js"></script> <script src="chrome://resources/js/cr/ui.js"></script>
...@@ -40,6 +43,9 @@ ...@@ -40,6 +43,9 @@
<script src="screen_error_message.js"></script> <script src="screen_error_message.js"></script>
<script src="user_pod_row.js"></script> <script src="user_pod_row.js"></script>
</head> </head>
<script>
console.log("## login.html before body");
</script>
<body class="login-display" i18n-values=".style.fontFamily:fontfamily;"> <body class="login-display" i18n-values=".style.fontFamily:fontfamily;">
<include src="header_bar.html"> <include src="header_bar.html">
<div id="outer-container"> <div id="outer-container">
...@@ -67,4 +73,7 @@ ...@@ -67,4 +73,7 @@
<include src="version.html"> <include src="version.html">
<include src="user_pod_template.html"> <include src="user_pod_template.html">
</body> </body>
<script>
console.log("## login.html after body");
</script>
</html> </html>
chrome/browser/resources/chromeos/login/login.js
View file @ 200f6674
...@@ -32,16 +32,20 @@ cr.define('cr.ui', function() { ...@@ -32,16 +32,20 @@ cr.define('cr.ui', function() {
* be invoked to do final setup. * be invoked to do final setup.
*/ */
Oobe.initialize = function() { Oobe.initialize = function() {
login.AccountPickerScreen.register(); try {
login.GaiaSigninScreen.register(); console.log("## Oobe.initialize");
oobe.OAuthEnrollmentScreen.register(); login.AccountPickerScreen.register();
oobe.UserImageScreen.register(); login.GaiaSigninScreen.register();
login.ErrorMessageScreen.register(); oobe.OAuthEnrollmentScreen.register();
oobe.UserImageScreen.register();
cr.ui.Bubble.decorate($('bubble')); login.ErrorMessageScreen.register();
login.HeaderBar.decorate($('login-header-bar')); cr.ui.Bubble.decorate($('bubble'));
login.HeaderBar.decorate($('login-header-bar'));
chrome.send('screenStateInitialize', []); console.log("## calling screenStateInitialize");
chrome.send('screenStateInitialize', []);
} catch (err) {
console.log("## error in initialize " + err.message);
}
}; };
/** /**
...@@ -169,4 +173,5 @@ var Oobe = cr.ui.Oobe; ...@@ -169,4 +173,5 @@ var Oobe = cr.ui.Oobe;
disableTextSelectAndDrag(); disableTextSelectAndDrag();
console.log("## registering DOMContentLoaded");
document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize); document.addEventListener('DOMContentLoaded', cr.ui.Oobe.initialize);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment