Commit 0e6ce626 authored by bartfab@chromium.org's avatar bartfab@chromium.org

Prevent automation from reporting login WebUI ready prematurely

One of the notifications telling the automation provider that the login
WebUI is ready might actually occur in a transient phase while the
browser is starting up and no network has been detected quite yet.

BUG=chromium-os:31067
TEST=Chrome builds, functional tests run


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137959 0039d316-1c4b-4281-b951-d872f2087c98
parent 366e57f5
...@@ -54,8 +54,6 @@ LoginWebuiReadyObserver::LoginWebuiReadyObserver(AutomationProvider* automation) ...@@ -54,8 +54,6 @@ LoginWebuiReadyObserver::LoginWebuiReadyObserver(AutomationProvider* automation)
content::NotificationService::AllSources()); content::NotificationService::AllSources());
registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED, registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
registrar_.Add(this, chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
content::NotificationService::AllSources());
registrar_.Add(this, chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN, registrar_.Add(this, chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
} }
...@@ -66,7 +64,6 @@ void LoginWebuiReadyObserver::Observe( ...@@ -66,7 +64,6 @@ void LoginWebuiReadyObserver::Observe(
const content::NotificationDetails& details) { const content::NotificationDetails& details) {
DCHECK(type == chrome::NOTIFICATION_LOGIN_WEBUI_READY || DCHECK(type == chrome::NOTIFICATION_LOGIN_WEBUI_READY ||
type == chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED || type == chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED ||
type == chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN ||
type == chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN); type == chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN);
if (automation_) if (automation_)
automation_->OnLoginWebuiReady(); automation_->OnLoginWebuiReady();
......
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