Convert more users away from DOMView.

chrome/browser/chromeos/login/web_page_view.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/chromeos/login/web_page_view.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 33 matching lines @@
 const int kStartDelayMs = 500;
 
 // Time in ms after that waiting controls are hidden on Stop.
 const int kStopDelayMs = 500;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // WebPageDomView, public:
 
+WebPageDomView::WebPageDomView(content::BrowserContext* browser_context)
+    : views::WebView(browser_context) {
+}
+
 void WebPageDomView::SetWebContentsDelegate(
     content::WebContentsDelegate* delegate) {
-  dom_contents_->web_contents()->SetDelegate(delegate);
+  web_contents()->SetDelegate(delegate);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WebPageView, public:
 
 WebPageView::WebPageView() : throbber_(NULL), connecting_label_(NULL) {}
 
 WebPageView::~WebPageView() {}
 
 void WebPageView::Init() {
@@ skipping 15 matching lines @@
   connecting_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
   connecting_label_->SetVisible(false);
   AddChildView(connecting_label_);
 
   start_timer_.Start(FROM_HERE,
                      TimeDelta::FromMilliseconds(kStartDelayMs),
                      this,
                      &WebPageView::ShowWaitingControls);
 }
 
-void WebPageView::InitDOM(Profile* profile,
-                          SiteInstance* site_instance) {
-  dom_view()->Init(profile, site_instance);
+void WebPageView::InitWebView(SiteInstance* site_instance) {
+  dom_view()->CreateWebContentsWithSiteInstance(site_instance);
 }
 
 void WebPageView::LoadURL(const GURL& url) {
-  dom_view()->LoadURL(url);
+  dom_view()->LoadInitialURL(url);
 }
 
 void WebPageView::SetWebContentsDelegate(
     content::WebContentsDelegate* delegate) {
   dom_view()->SetWebContentsDelegate(delegate);
 }
 
 void WebPageView::ShowPageContent() {
   // TODO(nkostylev): Show throbber as an overlay until page has been rendered.
   start_timer_.Stop();
@@ skipping 31 matching lines @@
       throbber_->GetPreferredSize().width(),
       throbber_->GetPreferredSize().height());
   connecting_label_->SetBounds(
       width() / 2 - connecting_label_->GetPreferredSize().width() / 2,
       y + throbber_->GetPreferredSize().height() + kSpacing,
       connecting_label_->GetPreferredSize().width(),
       connecting_label_->GetPreferredSize().height());
 }
 
 }  // namespace chromeos