diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 11:22:39 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 11:22:39 +0000 |
| commit | f375e9e032eeffc6904c95d4132cf9fd20d6b207 (patch) | |
| tree | 2ac627cff3df6fe5051f66b683fcfd876e0cc125 | |
| parent | d287b3b73bb1c8cfb444f9c4e262bf7dbcac230f (diff) | |
| download | chromium_src-f375e9e032eeffc6904c95d4132cf9fd20d6b207.zip chromium_src-f375e9e032eeffc6904c95d4132cf9fd20d6b207.tar.gz chromium_src-f375e9e032eeffc6904c95d4132cf9fd20d6b207.tar.bz2 | |
[ChromeOS] Don't show empty account picker.
- Show sign-in screen instead when reqeusting to show an empty account picker;
- Hide "Add User"/"Cancel" button in header bar when account picker is empty;
BUG=chromium-os:19127
TEST=Verify fix for chromium-os:19127.
Review URL: http://codereview.chromium.org/7633067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96917 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 19 insertions, 12 deletions
diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css index e6dfc3b..825e918 100644 --- a/chrome/browser/resources/chromeos/login/oobe.css +++ b/chrome/browser/resources/chromeos/login/oobe.css @@ -566,12 +566,13 @@ button { vertical-align: middle; } -.divider-vert { - background: url('chrome://theme/IDR_DIVIDER_VERT') center center no-repeat; +.header-bar-item { + -webkit-padding-start: 15px; + background-image: url('chrome://theme/IDR_DIVIDER_VERT'); + background-position: left center; + background-repeat: no-repeat; display: inline-block; height: 24px; - vertical-align: middle; - width: 15px; } #login-header-bar #shutdown-button { @@ -588,6 +589,7 @@ button { background-repeat: no-repeat; } +html[dir=rtl] .header-bar-item, html[dir=rtl] #shutdown-button, html[dir=rtl] #add-user-button { background-position: right center; diff --git a/chrome/browser/resources/chromeos/login/oobe.html b/chrome/browser/resources/chromeos/login/oobe.html index 9392cb61..b64182e 100644 --- a/chrome/browser/resources/chromeos/login/oobe.html +++ b/chrome/browser/resources/chromeos/login/oobe.html @@ -33,9 +33,10 @@ <body i18n-values=".style.fontFamily:fontfamily;"> <div id="login-header-bar" hidden> <button id="shutdown-button" i18n-content="shutDown"></button> - <span class="divider-vert"></span> - <button id="add-user-button" i18n-content="addUser"></button> - <button id="cancel-add-user-button" i18n-content="cancel" hidden></button> + <div id="add-user-header-bar-item" class="header-bar-item"> + <button id="add-user-button" i18n-content="addUser"></button> + <button id="cancel-add-user-button" i18n-content="cancel" hidden></button> + </div> </div> <div id="oobe" class="faded"> <div id="outer-container"> diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js index 745c0a8..e29b2fa 100644 --- a/chrome/browser/resources/chromeos/login/oobe.js +++ b/chrome/browser/resources/chromeos/login/oobe.js @@ -156,6 +156,13 @@ cr.define('cr.ui', function() { */ showScreen: function(screen) { var screenId = screen.id; + + // Show sign-in screen instead of account picker if pod row is empty. + if (screenId == SCREEN_ACCOUNT_PICKER && $('pod-row').pods.length == 0) { + Oobe.showSigninUI(); + return; + } + var data = screen.data; var index = this.getScreenIndex_(screenId); if (index >= 0) @@ -448,6 +455,7 @@ cr.define('cr.ui', function() { Oobe.showSigninUI = function(opt_email) { $('add-user-button').hidden = true; $('cancel-add-user-button').hidden = false; + $('add-user-header-bar-item').hidden = $('pod-row').pods.length == 0; chrome.send('showAddUser', [opt_email]); }; diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 2a6f01d..b2e5f8c 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -123,11 +123,7 @@ void SigninScreenHandler::Show(bool oobe_ui) { // figure out how to make it fast enough. SendUserList(false); - // Show sign-in UI if there is no visible users. - if (WebUILoginDisplay::GetInstance()->users().empty()) - HandleShowAddUser(NULL); - else - ShowScreen(kAccountPickerScreen, NULL); + ShowScreen(kAccountPickerScreen, NULL); } } |