Remove deprecated TabContentsDelegate::OpenURLFromTab variant

chrome/browser/chromeos/login/webui_login_view.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/render_view_host_observer.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #include "ui/views/widget/native_widget_gtk.h"
 #endif
 
 #if defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
 #endif
 
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
+
 namespace {
 
 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
 
 // These strings must be kept in sync with handleAccelerator() in oobe.js.
 const char kAccelNameAccessibility[] = "accessibility";
 const char kAccelNameCancel[] = "cancel";
 const char kAccelNameEnrollment[] = "enrollment";
 
 // Observes IPC messages from the FrameSniffer and notifies JS if error
@@ skipping 225 matching lines @@
 
 void WebUILoginView::OnTabMainFrameLoaded() {
   VLOG(1) << "WebUI login main frame loaded.";
 }
 
 void WebUILoginView::OnTabMainFrameFirstRender() {
   VLOG(1) << "WebUI login main frame rendered.";
   StatusAreaViewChromeos::SetScreenMode(
       StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
   // In aura there's a global status area shown already.
-  // TODO(nkostylev): Figure out how to communicate from login screen with
-  // global status area.
-#if !defined(USE_AURA)
+#if defined(USE_AURA)
+  status_area_ = ChromeShellDelegate::instance()->GetStatusArea();
+  status_area_->SetVisible(status_area_visibility_on_init_);
+#else
   InitStatusArea();
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
   if (host_window_frozen_) {
     host_window_frozen_ = false;
 
     // Unfreezes the host window since tab is rendered now.
     views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
         GetNativeWindow(), false);
@@ skipping 14 matching lines @@
 
   OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI());
   // Notify OOBE that the login frame has been rendered. Currently
   // this is used to start camera presence check.
   oobe_ui->OnLoginPromptVisible();
 }
 
 void WebUILoginView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   DCHECK(status_window_ == NULL);
-  status_area_ = new StatusAreaViewChromeos();
-  status_area_->Init(this);
+  StatusAreaViewChromeos* status_area_chromeos = new StatusAreaViewChromeos();
+  status_area_chromeos->Init(this);
+  status_area_ = status_area_chromeos;
   status_area_->SetVisible(status_area_visibility_on_init_);
 
   // Width of |status_window| is meant to be large enough.
   // The current value of status_area_->GetPreferredSize().width()
   // will be too small when button status is changed.
   // (e.g. when CapsLock indicator appears)
   gfx::Size widget_size(width()/2,
                         status_area_->GetPreferredSize().height());
   const int widget_x = base::i18n::IsRTL() ?
       kStatusAreaCornerPadding :
@@ skipping 65 matching lines @@
   // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding
   // an immediate authentication error (See crbug.com/103643).
   if (event.type == WebKit::WebInputEvent::KeyDown) {
     WebUI* web_ui = GetWebUI();
     if (web_ui)
       web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
   }
 }
 
 }  // namespace chromeos