Introduce a new error code from the DM server - 402 - missing licenses.

Introduce a new error code from the DM server - 402 - missing licenses.

Drive by cleanup: Consolidated the error reporting for the EnterpriseEnrollmentScreen.

BUG=chromium-os:30457
TEST=unit_tests. For manual testing set up the DMServer to send 402 error to registration request and observe the special error message on the enrollment screen.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144450

[pastarmovj, 2012-06-25 16:41:21]

@Mattias: Please review this as a whole.

@Nikita: Please review as an owner of chrome/browser/ui/webui/chromeos/login
feel free to review the rest of the UI related code too if you feel like.

Thanks!

[Mattias Nissler (ping if slow), 2012-06-26 09:19:34]

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
File chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
(right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:131:
EnterpriseEnrollmentScreenActor::MISSING_LICESES_ERROR);
Eclipse auto-complete strikes again.

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:252: if
(is_showing_)
curlies

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:270: if
(is_showing_)
curlies

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
File
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h
(right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:26:
FATAL_ENROLLMENT_ERROR,
_ENROLLMENT_ seems redundant to me.

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/chrom...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:28:
NETWORK_ENROLLMENT_ERROR,
same here

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/polic...
File chrome/browser/policy/device_token_fetcher.h (right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/polic...
chrome/browser/policy/device_token_fetcher.h:78: // The licenses for the domain
has expired or have been exhausted.
s/has/have/

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/polic...
File chrome/browser/policy/enterprise_metrics.h (right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/polic...
chrome/browser/policy/enterprise_metrics.h:48: // DM server reported that the
licenses for the domain has expired or been
s/has/have/

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/polic...
chrome/browser/policy/enterprise_metrics.h:155:
kMetricEnrollmentMissingSerialsError,
wrong name.

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/ui/we...
File
chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
(right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/browser/ui/we...
chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc:196:
NotifyObservers(false);
seems like the NotifyObservers(false) can be moved out of the switch.

[Mattias Nissler (ping if slow), 2012-06-26 09:28:23]

Cyrus, Glenn, Bin: You might have an opinion on the wording of the error
message.

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/app/generated...
File chrome/app/generated_resources.grd (right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/app/generated...
chrome/app/generated_resources.grd:16105: +        The domain this user belongs
to has ran out of licenses or the existing licenses have expired.
Not sure about the proper wording, adding Cyrus, Glenn, and Bin.

[Nikita (slow), 2012-06-26 10:32:56]

Hint: please test this also with this flagfile /root/.enable_new_oobe to use new
layout for OOBE/sign in.

That is a good chance to test that layout is fine. I've did simple check
sometime ago and fixed it, should be fine.

[Nikita (slow), 2012-06-26 10:37:34]

chromeos/login webui/chromeos/login lgtm

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
File
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h
(right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:31:
MISSING_LICESES_ERROR,
*LICENSES

[Bin, 2012-06-26 16:47:09]

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/app/generated...
File chrome/app/generated_resources.grd (right):

http://chromiumcodereview.appspot.com/10664017/diff/2002/chrome/app/generated...
chrome/app/generated_resources.grd:16105: +        The domain this user belongs
to has ran out of licenses or the existing licenses have expired.
On 2012/06/26 09:28:23, Mattias Nissler wrote:
> Not sure about the proper wording, adding Cyrus, Glenn, and Bin.

Below is the error message proposed by Divya. BTW the license are lifetime now,
so it won't expire.

"
You do not have enough software licenses to enroll this device. Please contact
sales to purchase more. If you believe you're seeing this message in error,
please contact support.
"

[pastarmovj, 2012-06-26 16:59:29]

Addressed all the comments and changed the user visible error message according
to Bin's comment.

http://codereview.chromium.org/10664017/diff/2002/chrome/app/generated_resour...
File chrome/app/generated_resources.grd (right):

http://codereview.chromium.org/10664017/diff/2002/chrome/app/generated_resour...
chrome/app/generated_resources.grd:16105: +        The domain this user belongs
to has ran out of licenses or the existing licenses have expired.
On 2012/06/26 16:47:09, binzhao1 wrote:
> On 2012/06/26 09:28:23, Mattias Nissler wrote:
> > Not sure about the proper wording, adding Cyrus, Glenn, and Bin.
> 
> Below is the error message proposed by Divya. BTW the license are lifetime
now,
> so it won't expire.
> 
> "
> You do not have enough software licenses to enroll this device. Please contact
> sales to purchase more. If you believe you're seeing this message in error,
> please contact support.
> "

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
File chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
(right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:131:
EnterpriseEnrollmentScreenActor::MISSING_LICESES_ERROR);
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> Eclipse auto-complete strikes again.

Prolly :) Fixed.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:252: if
(is_showing_)
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> curlies

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc:270: if
(is_showing_)
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> curlies

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
File
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h
(right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:26:
FATAL_ENROLLMENT_ERROR,
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> _ENROLLMENT_ seems redundant to me.

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:28:
NETWORK_ENROLLMENT_ERROR,
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> same here

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/chromeos/log...
chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h:31:
MISSING_LICESES_ERROR,
On 2012/06/26 10:37:34, Nikita Kostylev wrote:
> *LICENSES

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/policy/devic...
File chrome/browser/policy/device_token_fetcher.h (right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/policy/devic...
chrome/browser/policy/device_token_fetcher.h:78: // The licenses for the domain
has expired or have been exhausted.
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> s/has/have/

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/policy/enter...
File chrome/browser/policy/enterprise_metrics.h (right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/policy/enter...
chrome/browser/policy/enterprise_metrics.h:48: // DM server reported that the
licenses for the domain has expired or been
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> s/has/have/

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/policy/enter...
chrome/browser/policy/enterprise_metrics.h:155:
kMetricEnrollmentMissingSerialsError,
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> wrong name.

Done.

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/ui/webui/chr...
File
chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
(right):

http://codereview.chromium.org/10664017/diff/2002/chrome/browser/ui/webui/chr...
chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc:196:
NotifyObservers(false);
On 2012/06/26 09:19:34, Mattias Nissler wrote:
> seems like the NotifyObservers(false) can be moved out of the switch.

Done.

[pastarmovj, 2012-06-26 17:11:23]

On 2012/06/26 10:32:56, Nikita Kostylev wrote:
> Hint: please test this also with this flagfile /root/.enable_new_oobe to use
new
> layout for OOBE/sign in.
> 
> That is a good chance to test that layout is fine. I've did simple check
> sometime ago and fixed it, should be fine.

It works well with the new OOBE but the managed banner doesn't appear until i
restart the UI. Is this intended or a bug?

[pastarmovj, 2012-06-26 17:15:28]

On 2012/06/26 10:32:56, Nikita Kostylev wrote:
> Hint: please test this also with this flagfile /root/.enable_new_oobe to use
new
> layout for OOBE/sign in.
> 
> That is a good chance to test that layout is fine. I've did simple check
> sometime ago and fixed it, should be fine.

Also after logging in for the first time and logging out the user is not
remembered. using a second user is remembered but instead of showing the pods
the browser constantly restarts with a NOTREACHED at
WebUILoginDisplayHost::StartPostponedWebUI line 252. This all happens when the
.forget_usernames is deleted.

[Bin, 2012-06-26 21:11:49]

Error message looks good to me.

[Mattias Nissler (ping if slow), 2012-06-27 12:12:10]

LGTM after you fix my comment.

http://codereview.chromium.org/10664017/diff/12004/chrome/browser/policy/ente...
File chrome/browser/policy/enterprise_metrics.h (right):

http://codereview.chromium.org/10664017/diff/12004/chrome/browser/policy/ente...
chrome/browser/policy/enterprise_metrics.h:155: kMetricMissingSerialsError,
Name still broken.

[pastarmovj, 2012-06-27 12:30:46]

http://codereview.chromium.org/10664017/diff/12004/chrome/browser/policy/ente...
File chrome/browser/policy/enterprise_metrics.h (right):

http://codereview.chromium.org/10664017/diff/12004/chrome/browser/policy/ente...
chrome/browser/policy/enterprise_metrics.h:155: kMetricMissingSerialsError,
On 2012/06/27 12:12:10, Mattias Nissler wrote:
> Name still broken.

Arrrgh you know how many times did i typed serials instead of licenses (all
sounds like wirez to me ;D )

[commit-bot: I haz the power, 2012-06-27 12:31:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pastarmovj@chromium.org/10664017/16002

[commit-bot: I haz the power, 2012-06-27 13:48:55]

Change committed as 144450