X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fwebui%2Fchromeos%2Flogin%2Ferror_screen_handler.cc;h=b25aa16a9a345d0a7026335ae7b0febd62a04991;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=5a6a77a9ddf78b369d0fdf26dfba9648d6670bee;hpb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc b/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
index 5a6a77a..b25aa16 100644
--- a/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
+++ b/src/chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc
@@ -10,14 +10,17 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
 #include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h"
-#include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
+#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ -26,9 +29,11 @@
 #include "components/user_manager/user_manager.h"
 #include "extensions/browser/extension_system.h"
 #include "grit/browser_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/ui_strings.h"
+#include "ui/strings/grit/ui_strings.h"
+
+#if !defined(USE_ATHENA)
+#include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"
+#endif
 
 namespace {
 
@@ -48,7 +53,10 @@ ErrorScreenHandler::ErrorScreenHandler(
   DCHECK(network_state_informer_.get());
 }
 
-ErrorScreenHandler::~ErrorScreenHandler() {}
+ErrorScreenHandler::~ErrorScreenHandler() {
+  if (delegate_)
+    delegate_->OnActorDestroyed();
+}
 
 void ErrorScreenHandler::SetDelegate(ErrorScreenActorDelegate* delegate) {
   delegate_ = delegate;
@@ -99,6 +107,7 @@ void ErrorScreenHandler::Hide() {
 }
 
 void ErrorScreenHandler::FixCaptivePortal() {
+#if !defined(USE_ATHENA)
   if (!captive_portal_window_proxy_.get()) {
     content::WebContents* web_contents =
         LoginDisplayHostImpl::default_host()->GetWebUILoginView()->
@@ -108,18 +117,27 @@ void ErrorScreenHandler::FixCaptivePortal() {
                                      web_contents));
   }
   captive_portal_window_proxy_->ShowIfRedirected();
+#endif
 }
 
 void ErrorScreenHandler::ShowCaptivePortal() {
+#if defined(USE_ATHENA)
+  // TODO(ygorshenin): Figure out what the captive portal should look like
+  // on athena (crbug.com/430300)
+  NOTIMPLEMENTED();
+#else
   // This call is an explicit user action
   // i.e. clicking on link so force dialog show.
   FixCaptivePortal();
   captive_portal_window_proxy_->Show();
+#endif
 }
 
 void ErrorScreenHandler::HideCaptivePortal() {
+#if !defined(USE_ATHENA)
   if (captive_portal_window_proxy_.get())
     captive_portal_window_proxy_->Close();
+#endif
 }
 
 void ErrorScreenHandler::SetUIState(ErrorScreen::UIState ui_state) {