cros: Only preload the lock screen; do not reuse it.

chrome/browser/chromeos/login/ui/webui_login_view.cc

 // Copyright 2014 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/ui/webui_login_view.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/system/status_area_widget_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
+#include "chrome/browser/chromeos/login/ui/preloaded_web_view.h"
+#include "chrome/browser/chromeos/login/ui/preloaded_web_view_factory.h"
 #include "chrome/browser/chromeos/login/ui/proxy_settings_dialog.h"
-#include "chrome/browser/chromeos/login/ui/shared_web_view.h"
-#include "chrome/browser/chromeos/login/ui/shared_web_view_factory.h"
 #include "chrome/browser/chromeos/login/ui/web_contents_forced_title.h"
 #include "chrome/browser/chromeos/login/ui/web_contents_set_background_color.h"
-#include "chrome/browser/chromeos/login/ui/web_view_handle.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/ash/ash_util.h"
@@ skipping 212 matching lines @@
         ash::Shell::GetInstance()->GetPrimarySystemTray()->GetWidget();
     ash::StatusAreaWidgetDelegate* status_area_widget_delegate =
         static_cast<ash::StatusAreaWidgetDelegate*>(
             tray_widget->GetContentsView());
     status_area_widget_delegate->set_custom_focus_traversable(nullptr);
     status_area_widget_delegate->set_default_last_focusable_child(false);
   } else {
     NOTIMPLEMENTED();
   }
 
-  // If the WebView is going to be reused, make sure we call teardown.
-  if (!webui_login_->HasOneRef())
-    GetWebUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.teardown");
-
   // Clear any delegates we have set on the WebView.
   WebContents* web_contents = web_view()->GetWebContents();
   WebContentsModalDialogManager::FromWebContents(web_contents)
       ->SetDelegate(nullptr);
   web_contents->SetDelegate(nullptr);
 }
 
 // static
 void WebUILoginView::InitializeWebView(views::WebView* web_view,
                                        const base::string16& title) {
@@ skipping 22 matching lines @@
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents);
   content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
   renderer_preferences_util::UpdateFromSystemSettings(
       prefs, ProfileHelper::GetSigninProfile(), web_contents);
 }
 
 void WebUILoginView::Init() {
   Profile* signin_profile = ProfileHelper::GetSigninProfile();
 
-  if (!settings_.preloaded_url.is_empty()) {
-    SharedWebView* shared_web_view =
-        SharedWebViewFactory::GetForProfile(signin_profile);
-    is_reusing_webview_ =
-        shared_web_view->Get(settings_.preloaded_url, &webui_login_);
-  } else {
-    webui_login_ = new WebViewHandle(signin_profile);
+  if (settings_.check_for_preload) {
+    PreloadedWebView* preloaded_web_view =
+        PreloadedWebViewFactory::GetForProfile(signin_profile);
+    // webui_login_ may still be null after this call if there is no preloaded
+    // instance.
+    webui_login_ = preloaded_web_view->TryTake();
+    is_reusing_webview_ = true;
+  }
+
+  if (!webui_login_) {
+    webui_login_ = base::MakeUnique<views::WebView>(signin_profile);
+    webui_login_->set_owned_by_client();
     is_reusing_webview_ = false;
   }
 
   WebContents* web_contents = web_view()->GetWebContents();
   if (!is_reusing_webview_)
     InitializeWebView(web_view(), settings_.web_view_title);
 
   web_view()->set_allow_accelerators(true);
   AddChildView(web_view());
 
@@ skipping 61 matching lines @@
   }
 
   return true;
 }
 
 gfx::NativeWindow WebUILoginView::GetNativeWindow() const {
   return GetWidget()->GetNativeWindow();
 }
 
 void WebUILoginView::LoadURL(const GURL& url) {
-  // If a preloaded_url is provided then |url| must match it.
-  DCHECK(settings_.preloaded_url.is_empty() || url == settings_.preloaded_url);
-
-  if (is_reusing_webview_ && !settings_.preloaded_url.is_empty())
-    GetWebUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.reload");
-  else
+  if (!is_reusing_webview_)
     web_view()->LoadInitialURL(url);
   web_view()->RequestFocus();
 
   // There is no Shell instance while running in mash.
   if (chrome::IsRunningInMash())
     return;
 
   ash::StatusAreaWidgetDelegate* status_area_widget_delegate =
       GetStatusAreaWidgetDelegate();
   DCHECK(status_area_widget_delegate);
@@ skipping 81 matching lines @@
       OnLoginPromptVisible();
       registrar_.RemoveAll();
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 views::WebView* WebUILoginView::web_view() {
-  return webui_login_->web_view();
+  return webui_login_.get();
 }
 
 // WebUILoginView private: -----------------------------------------------------
 
 bool WebUILoginView::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Do not show the context menu.
 #ifndef NDEBUG
   return false;
 #else
@@ skipping 122 matching lines @@
   if (should_emit_login_prompt_visible_) {
     VLOG(1) << "Login WebUI >> login-prompt-visible";
     chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
         EmitLoginPromptVisible();
   }
 
   webui_visible_ = true;
 }
 
 }  // namespace chromeos