Merge 159996 - Fix bug with login-prompt-visible not being sent in some rare cases.

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 99 matching lines @@
 
 namespace chromeos {
 
 // WebUILoginView public: ------------------------------------------------------
 
 WebUILoginView::WebUILoginView()
     : webui_login_(NULL),
       login_window_(NULL),
       host_window_frozen_(false),
       is_hidden_(false),
-      login_visible_notification_fired_(false),
       login_prompt_visible_handled_(false),
       should_emit_login_prompt_visible_(true) {
   registrar_.Add(this,
                  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)] =
@@ skipping 101 matching lines @@
 }
 
 void WebUILoginView::OpenProxySettings() {
   ProxySettingsDialog* dialog =
       new ProxySettingsDialog(NULL, GetNativeWindow());
   dialog->Show();
 }
 
 void WebUILoginView::OnPostponedShow() {
   set_is_hidden(false);
-  // If notification will happen later let it fire login-prompt-visible signal.
-  if (login_visible_notification_fired_) {
-    LOG(INFO) << "Login WebUI >> postponed show, login_visible already fired";
-    OnLoginPromptVisible();
-  }
+  OnLoginPromptVisible();
 }
 
 void WebUILoginView::SetStatusAreaVisible(bool visible) {
   ash::SystemTray* tray = ash::Shell::GetInstance()->system_tray();
   if (tray) {
     if (visible) {
       // Tray may have been initialized being hidden.
       tray->SetVisible(visible);
       tray->GetWidget()->Show();
     } else {
@@ skipping 21 matching lines @@
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 void WebUILoginView::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE: {
-      login_visible_notification_fired_ = true;
       OnLoginPromptVisible();
       registrar_.RemoveAll();
       break;
     }
     case content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED: {
       RenderViewHost* render_view_host =
           content::Details<RenderViewHost>(details).ptr();
       new SnifferObserver(render_view_host, GetWebUI());
       break;
     }
@@ skipping 77 matching lines @@
   aura::Env::GetInstance()->set_render_white_bg(true);
 }
 
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos