[cros] Change how we track momemt to emit login-prompt-visible signal.

chrome/browser/chromeos/login/webui_login_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 95 matching lines @@
 }  // namespace
 
 namespace chromeos {
 
 // WebUILoginView public: ------------------------------------------------------
 
 WebUILoginView::WebUILoginView()
     : webui_login_(NULL),
       login_window_(NULL),
       host_window_frozen_(false),
-      login_page_is_loaded_(false),
       should_emit_login_prompt_visible_(true) {
-
   registrar_.Add(this,
-                 chrome::NOTIFICATION_LOGIN_WEBUI_READY,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN,
+                 chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                  content::NotificationService::AllSources());
 
   accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
       kAccelNameCancel;
   accel_map_[ui::Accelerator(ui::VKEY_E,
                              ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
       kAccelNameEnrollment;
   accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
       kAccelNameVersion;
 
@@ skipping 125 matching lines @@
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 void WebUILoginView::OnRenderHostCreated(RenderViewHost* host) {
   new SnifferObserver(host, GetWebUI());
 }
 
 void WebUILoginView::OnTabMainFrameLoaded() {
   VLOG(1) << "WebUI login main frame loaded.";
+  tab_watcher_.reset();
 }
 
 void WebUILoginView::OnTabMainFrameRender() {
-  if (!login_page_is_loaded_)
-    return;
-
-  VLOG(1) << "WebUI login main frame rendered.";
-  tab_watcher_.reset();
-
-  if (should_emit_login_prompt_visible_) {
-    chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
-        EmitLoginPromptVisible();
-  }
-
-  OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI()->GetController());
-  // Notify OOBE that the login frame has been rendered. Currently
-  // this is used to start camera presence check.
-  oobe_ui->OnLoginPromptVisible();
 }
 
 void WebUILoginView::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_LOGIN_WEBUI_READY:
-    case chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED:
-    case chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN:
-    case chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN:
-      login_page_is_loaded_ = true;
+    case chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE:
+      OnLoginPromptVisible();
+      registrar_.RemoveAll();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 // WebUILoginView private: -----------------------------------------------------
 
 bool WebUILoginView::HandleContextMenu(
     const content::ContextMenuParams& params) {
@@ skipping 27 matching lines @@
   ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray();
   if (tray && tray->GetWidget()->IsVisible()) {
     tray->SetNextFocusableView(this);
     ash::Shell::GetInstance()->RotateFocus(reverse ? ash::Shell::BACKWARD :
                                                      ash::Shell::FORWARD);
   }
 
   return true;
 }
 
+void WebUILoginView::OnLoginPromptVisible() {
+  if (should_emit_login_prompt_visible_) {
+    chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
+        EmitLoginPromptVisible();
+  }
+
+  OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI()->GetController());
+  // Notify OOBE that the login frame has been rendered. Currently
+  // this is used to start camera presence check.
+  oobe_ui->OnLoginPromptVisible();
+}
+
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos