Convert more users away from DOMView.

chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc

Index: chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
===================================================================
--- chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc	(revision 133597)
+++ chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc	(working copy)
@@ -154,7 +154,7 @@
   GURL keyboard_url_;
 
   // The WebView to host the keyboard.
-  views::WebView* webview_;
+  views::WebView* web_view_;
 
   ExtensionFunctionDispatcher extension_dispatcher_;
 
@@ -172,7 +172,7 @@
 KeyboardWidget::KeyboardWidget()
     : views::Widget::Widget(),
       keyboard_url_(chrome::kChromeUIKeyboardURL),
-      webview_(new DOMView(ProfileManager::GetDefaultProfile()))),
+      web_view_(new views::WebView(ProfileManager::GetDefaultProfile()))),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_dispatcher_(ProfileManager::GetDefaultProfile(), this)),
       target_(NULL),
@@ -190,14 +190,14 @@
   Init(params);
 
   // Setup the DOM view to host the keyboard.
-  webview_->CreateWebContentsWithSiteInstance(
-      content::SiteInstance::CreateForURL(webview_->browser_context(),
+  web_view_->CreateWebContentsWithSiteInstance(
+      content::SiteInstance::CreateForURL(web_view_->browser_context(),
                                           keyboard_url_));
-  webview_->LoadInitialURL(keyboard_url_);
-  SetContentsView(webview_);
+  web_view_->LoadInitialURL(keyboard_url_);
+  SetContentsView(web_view_);
 
   // Setup observer so the events from the keyboard can be handled.
-  content::WebContentsObserver::Observe(webview_->web_contents());
+  content::WebContentsObserver::Observe(web_view_->web_contents());
 
   // Initialize the animation.
   animation_.reset(new ui::SlideAnimation(this));
@@ -342,14 +342,15 @@
 void KeyboardWidget::RenderViewGone(base::TerminationStatus status) {
   if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
     // Reload the keyboard if it crashes.
-    webview_->LoadInitialURL(keyboard_url_);
-    webview_->SchedulePaint();
+    web_view_->LoadInitialURL(keyboard_url_);
+    web_view_->SchedulePaint();
   }
 }
 
 void KeyboardWidget::OnRequest(const ExtensionHostMsg_Request_Params& request) {
-  extension_dispatcher_.Dispatch(request,
-                                 webview_->web_contents()->GetRenderViewHost());
+  extension_dispatcher_.Dispatch(
+      request,
+      web_view_->web_contents()->GetRenderViewHost());
 }
 
 void KeyboardWidget::TextInputTypeChanged(ui::TextInputType type,
@@ -399,7 +400,7 @@
   std::string json_args;
   base::JSONWriter::Write(&args, &json_args);
 
-  Profile* profile = Profile::FromBrowserContext(webview_->browser_context());
+  Profile* profile = Profile::FromBrowserContext(web_view_->browser_context());
   profile->GetExtensionEventRouter()->DispatchEventToRenderers(
       kOnTextInputTypeChanged, json_args, NULL, GURL());
 
@@ -417,7 +418,7 @@
 }
 
 content::WebContents* KeyboardWidget::GetAssociatedWebContents() const {
-  return webview_->web_contents();
+  return web_view_->web_contents();
 }
 
 #if defined(OS_CHROMEOS)
@@ -426,7 +427,7 @@
     const chromeos::input_method::VirtualKeyboard& virtual_keyboard,
     const std::string& virtual_keyboard_layout) {
   const GURL& url = virtual_keyboard.GetURLForLayout(virtual_keyboard_layout);
-  webview_->LoadInitialURL(url);
+  web_view_->LoadInitialURL(url);
   VLOG(1) << "VirtualKeyboardChanged: Switched to " << url.spec();
 }
 #endif