Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/ui/views/external_protocol_dialog.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/ui/views/external_protocol_dialog.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::WebContents;
 
 namespace {
@@ skipping 122 matching lines @@
   message_text += l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING);
 
   views::MessageBoxView::InitParams params(message_text);
   params.message_width = kMessageWidth;
   message_box_view_ = new views::MessageBoxView(params);
   message_box_view_->SetCheckBoxLabel(
       l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT));
 
   HWND root_hwnd;
   if (web_contents_) {
-    root_hwnd = GetAncestor(web_contents_->GetContentNativeView(), GA_ROOT);
+    root_hwnd = GetAncestor(web_contents_->GetView()->GetContentNativeView(),
+                            GA_ROOT);
   } else {
     // Dialog is top level if we don't have a web_contents associated with us.
     root_hwnd = NULL;
   }
 
   views::Widget::CreateWindowWithParent(this, root_hwnd)->Show();
 }
 
 // static
 std::wstring ExternalProtocolDialog::GetApplicationForProtocol(
@@ skipping 12 matching lines @@
   std::wstring parameters = url_spec.substr(split_offset + 1,
                                             url_spec.length() - 1);
   std::wstring application_to_launch;
   if (cmd_key.ReadValue(NULL, &application_to_launch) == ERROR_SUCCESS) {
     ReplaceSubstringsAfterOffset(&application_to_launch, 0, L"%1", parameters);
     return application_to_launch;
   } else {
     return std::wstring();
   }
 }