cros: Enable WebUILoginView reuse.

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/login/ui/login_display_host_impl.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_set_background_color.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"
@@ skipping 134 matching lines @@
 
  private:
   WebUILoginView* const webui_login_view_;
   views::FocusSearch status_area_focus_search_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaFocusTraversable);
 };
 
 // WebUILoginView public: ------------------------------------------------------
 
-WebUILoginView::WebUILoginView() {
+WebUILoginView::WebUILoginView(const WebViewSettings& settings)
+    : settings_(settings) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
                  content::NotificationService::AllSources());
 
   accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
       kAccelNameCancel;
   accel_map_[ui::Accelerator(ui::VKEY_E,
@@ skipping 53 matching lines @@
     views::Widget* tray_widget =
         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 (is_reusing_webview_)

[xiyuan, 2016/12/09 22:37:30]

We would skip Oobe.teardown if |webui_login_| is created regardless whether it
is created from SharedWebView or from WebUILoginView ?

Should we always call Oobe.teardown if |webui_login_| is from SharedWebView
since we are going to re-use it later ?

[jdufault, 2016/12/12 18:23:09]

Good catch, thanks.

+    GetWebUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.teardown");
 }
 
-void WebUILoginView::Init() {
-  Profile* signin_profile = ProfileHelper::GetSigninProfile();
-  webui_login_ = new views::WebView(signin_profile);
-  webui_login_->set_allow_accelerators(true);
-  AddChildView(webui_login_);
+// static
+void WebUILoginView::InitializeWebView(views::WebView* web_view) {
+  WebContents* web_contents = web_view->GetWebContents();
 
-  WebContents* web_contents = webui_login_->GetWebContents();
+  WebContentsSetBackgroundColor::CreateForWebContentsWithColor(
+      web_contents, SK_ColorTRANSPARENT);
 
   // Ensure that the login UI has a tab ID, which will allow the GAIA auth
   // extension's background script to tell it apart from a captive portal window
   // that may be opened on top of this UI.
   SessionTabHelper::CreateForWebContents(web_contents);
 
   // Create the password manager that is needed for the proxy.
   ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
       web_contents,
       autofill::ChromeAutofillClient::FromWebContents(web_contents));
 
   // LoginHandlerViews uses a constrained window for the password manager view.
   WebContentsModalDialogManager::CreateForWebContents(web_contents);
-  WebContentsModalDialogManager::FromWebContents(web_contents)->
-      SetDelegate(this);
 
-  web_contents->SetDelegate(this);
   extensions::SetViewType(web_contents, extensions::VIEW_TYPE_COMPONENT);
   extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
       web_contents);
   content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
   renderer_preferences_util::UpdateFromSystemSettings(
-      prefs, signin_profile, web_contents);
+      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);
+    webview_usage_handle_ =
+        base::MakeUnique<SharedWebViewUsageHandle>(shared_web_view);
+    is_reusing_webview_ =
+        shared_web_view->Get(settings_.preloaded_url, &webui_login_);
+  } else {
+    webui_login_ = new views::WebView(signin_profile);
+    is_reusing_webview_ = false;
+  }
+
+  WebContents* web_contents = webui_login_->GetWebContents();
+  if (!is_reusing_webview_)
+    InitializeWebView(webui_login_);
+
+  webui_login_->set_allow_accelerators(true);
+  AddChildView(webui_login_);
+
+  WebContentsModalDialogManager::FromWebContents(web_contents)
+      ->SetDelegate(this);
+  web_contents->SetDelegate(this);

[xiyuan, 2016/12/09 22:37:30]

Clear these two delegate in dtor just in case?

[jdufault, 2016/12/12 18:23:09]

Done.

 
   status_area_widget_host_ = new views::View;
   AddChildView(status_area_widget_host_);
 }
 
 const char* WebUILoginView::GetClassName() const {
   return kViewClassName;
 }
 
 void WebUILoginView::RequestFocus() {
@@ skipping 47 matching lines @@
                                          accel_name);
   }
 
   return true;
 }
 
 gfx::NativeWindow WebUILoginView::GetNativeWindow() const {
   return GetWidget()->GetNativeWindow();
 }
 
-void WebUILoginView::LoadURL(const GURL & url) {
-  webui_login_->LoadInitialURL(url);
+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
+    webui_login_->LoadInitialURL(url);
   webui_login_->RequestFocus();
 
-  WebContentsSetBackgroundColor::CreateForWebContentsWithColor(
-      GetWebContents(), SK_ColorTRANSPARENT);
-
   // 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);
   cycle_focus_traversable_.reset(new CycleFocusTraversable(this));
   status_area_focus_traversable_.reset(
       new StatusAreaFocusTraversable(status_area_widget_delegate, this));
   status_area_widget_delegate->set_custom_focus_traversable(
       status_area_focus_traversable_.get());
 }
 
 content::WebUI* WebUILoginView::GetWebUI() {
+  if (!webui_login_->web_contents())
+    return nullptr;

[xiyuan, 2016/12/09 22:37:30]

Out of curiosity, this is needed now because we reuse the webview?

[jdufault, 2016/12/12 18:23:09]

Yep.

+
   return webui_login_->web_contents()->GetWebUI();
 }
 
 content::WebContents* WebUILoginView::GetWebContents() {
   return webui_login_->web_contents();
 }
 
 OobeUI* WebUILoginView::GetOobeUI() {
+  if (!GetWebUI())
+    return nullptr;
+
   return static_cast<OobeUI*>(GetWebUI()->GetController());
 }
 
 void WebUILoginView::OpenProxySettings() {
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network) {
     LOG(ERROR) << "No default network found!";
     return;
   }
@@ skipping 218 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