[cros] Captive portal dialog fixes.

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/callback.h"
 #include "base/command_line.h"
@@ skipping 424 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("launchDemoUser",
       base::Bind(&SigninScreenHandler::HandleLaunchDemoUser,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("launchIncognito",
       base::Bind(&SigninScreenHandler::HandleLaunchIncognito,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("fixCaptivePortal",
       base::Bind(&SigninScreenHandler::HandleFixCaptivePortal,
                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("showCaptivePortal",
+        base::Bind(&SigninScreenHandler::HandleShowCaptivePortal,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("hideCaptivePortal",
       base::Bind(&SigninScreenHandler::HandleHideCaptivePortal,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("offlineLogin",
       base::Bind(&SigninScreenHandler::HandleOfflineLogin,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("showAddUser",
       base::Bind(&SigninScreenHandler::HandleShowAddUser,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("shutdownSystem",
@@ skipping 271 matching lines @@
   // TODO(altimofeev): move error page and captive portal window showing logic
   // to C++ (currenly most of it is done on the JS side).
   if (!captive_portal_window_proxy_.get()) {
     captive_portal_window_proxy_.reset(
         new CaptivePortalWindowProxy(network_state_informer_.get(),
                                      GetNativeWindow()));
   }
   captive_portal_window_proxy_->ShowIfRedirected();
 }
 
+void SigninScreenHandler::HandleShowCaptivePortal(const base::ListValue* args) {
+  // This call is an explicit user action
+  // i.e. clicking on link so force dialog show.
+  HandleFixCaptivePortal(args);
+  captive_portal_window_proxy_->Show();
+}
+
 void SigninScreenHandler::HandleHideCaptivePortal(const base::ListValue* args) {
   if (captive_portal_window_proxy_.get())
     captive_portal_window_proxy_->Close();
 }
 
 void SigninScreenHandler::HandleOfflineLogin(const base::ListValue* args) {
   if (!delegate_ || delegate_->IsShowUsers()) {
     NOTREACHED();
     return;
   }
@@ skipping 269 matching lines @@
       !cookie_remover_ &&
       !dns_clear_task_running_ &&
       network_state_informer_->is_online()) {
     gaia_silent_load_ = true;
     gaia_silent_load_network_ = network_state_informer_->active_network_id();
     LoadAuthExtension(true, true, false);
   }
 }
 
 }  // namespace chromeos