[cros] Member variables cleanup in SigninScreenHandler.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 238 matching lines @@
     SendState(*it, reason);
   }
 }
 
 // SigninScreenHandler implementation ------------------------------------------
 
 SigninScreenHandler::SigninScreenHandler()
     : delegate_(NULL),
       show_on_init_(false),
       oobe_ui_(false),
-      is_first_webui_ready_(false),
-      is_first_attempt_(true),
+      focus_stolen_(false),
+      gaia_silent_load_(false),
       dns_cleared_(false),
       dns_clear_task_running_(false),
       cookies_cleared_(false),
       cookie_remover_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       key_event_listener_(NULL) {
   CrosSettings::Get()->AddSettingsObserver(kAccountsPrefAllowNewUser, this);
   CrosSettings::Get()->AddSettingsObserver(kAccountsPrefAllowGuest, this);
 }
 
@@ skipping 274 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   dns_clear_task_running_ = false;
   dns_cleared_ = true;
   ShowSigninScreenIfReady();
 }
 
 void SigninScreenHandler::ShowSigninScreenIfReady() {
   if (!dns_cleared_ || !cookies_cleared_)
     return;
 
-  LoadAuthExtension(!is_first_attempt_, false, false);
+  LoadAuthExtension(!gaia_silent_load_, false, false);
   ShowScreen(kGaiaSigninScreen, NULL);
 
-  if (is_first_attempt_) {
-    is_first_attempt_ = false;
-    if (is_first_webui_ready_)
+  if (gaia_silent_load_) {
+    // The variable is assigned to false because silently loaded Gaia page was
+    // used.
+    gaia_silent_load_ = false;
+    if (focus_stolen_)
       HandleLoginWebuiReady(NULL);
   }
 }
 
 void SigninScreenHandler::LoadAuthExtension(
     bool force, bool silent_load, bool offline) {
   DictionaryValue params;
 
   params.SetBoolean("forceReload", force);
   params.SetBoolean("silentLoad", silent_load);
@@ skipping 146 matching lines @@
   }
 
   delegate_->RemoveUser(email);
 }
 
 void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) {
   email_.clear();
   // |args| can be null if it's OOBE.
   if (args)
     args->GetString(0, &email_);
-  LOG(ERROR) << "HandleShowAddUser: email=" << email_ << ", first_attempt="
-             << is_first_attempt_;
+  LOG(ERROR) << "HandleShowAddUser: email=" << email_ << ", gaia_sielnt_load="
+             << gaia_silent_load_;
 
-  if (is_first_attempt_ && email_.empty()) {
+  if (gaia_silent_load_ && email_.empty()) {
     dns_cleared_ = true;
     cookies_cleared_ = true;
     ShowSigninScreenIfReady();
   } else {
     StartClearingDnsCache();
     StartClearingCookies();
   }
 }
 
 void SigninScreenHandler::HandleToggleEnrollmentScreen(
@@ skipping 79 matching lines @@
   web_ui()->CallJavascriptFunction("login.AccountPickerScreen.loadUsers",
                                    users_list, animated_value);
 }
 
 void SigninScreenHandler::HandleAccountPickerReady(
     const base::ListValue* args) {
   // Fetching of the extension is not started before account picker page is
   // loaded because it can affect the loading speed.
   // Do not load the extension for the screen locker, see crosbug.com/25018.
   if (!ScreenLocker::default_screen_locker() &&
-      is_first_attempt_ &&
+      !gaia_silent_load_ &&
       !cookie_remover_ &&
-      !dns_clear_task_running_)
+      !dns_clear_task_running_) {
+    gaia_silent_load_ = true;
     LoadAuthExtension(true, true, false);
+  }
 
   if (ScreenLocker::default_screen_locker()) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOCK_WEBUI_READY,
         content::NotificationService::AllSources(),
         content::NotificationService::NoDetails());
   }
 }
 
 void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) {
   // crosbug.com/26646.
-  LOG(ERROR) << "HandleLoginWebuiReady: first_webui_ready="
-             << is_first_webui_ready_
-             << ", first_attempt=" << is_first_attempt_;
+  LOG(ERROR) << "HandleLoginWebuiReady: focus_stolen=" << focus_stolen_
+             << ", gaia_silent_load=" << gaia_silent_load_;
 
-  if (is_first_webui_ready_) {
+  if (focus_stolen_) {
     // Set focus to the Gaia page.
     // TODO(altimofeev): temporary solution, until focus parameters are
     // implemented on the Gaia side.
     // Do this only once. Any subsequent call would relod GAIA frame.
-    is_first_webui_ready_ = false;
+    focus_stolen_ = false;
     const char code[] = "gWindowOnLoad();";
     RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
     rvh->ExecuteJavascriptInWebFrame(
         ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
         ASCIIToUTF16(code));
   }
-  if (!is_first_attempt_) {
+  if (!gaia_silent_load_) {
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGIN_WEBUI_READY,
         content::NotificationService::AllSources(),
         content::NotificationService::NoDetails());
   } else {
-    is_first_webui_ready_ = true;
+    focus_stolen_ = true;
     // Prevent focus stealing by the Gaia page.
     // TODO(altimofeev): temporary solution, until focus parameters are
     // implemented on the Gaia side.
     const char code[] = "var gWindowOnLoad = window.onload; "
                         "window.onload=function() {};";
     RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
     rvh->ExecuteJavascriptInWebFrame(
         ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
         ASCIIToUTF16(code));
   }
@@ skipping 79 matching lines @@
 
   cookie_remover_ = new BrowsingDataRemover(
       Profile::FromWebUI(web_ui()),
       BrowsingDataRemover::EVERYTHING,
       base::Time());
   cookie_remover_->AddObserver(this);
   cookie_remover_->Remove(BrowsingDataRemover::REMOVE_SITE_DATA);
 }
 
 }  // namespace chromeos