Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/external_tab_container_win.cc

 // Copyright (c) 2011 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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
@@ skipping 914 matching lines @@
 void ExternalTabContainer::InfoBarContainerStateChanged(bool is_animating) {
   if (external_tab_view_)
     external_tab_view_->Layout();
 }
 
 bool ExternalTabContainer::DrawInfoBarArrows(int* x) const {
   return false;
 }
 
 // ExternalTabContainer instances do not have a window.
-views::Window* ExternalTabContainer::GetContainingWindow() {
-  return NULL;
-}
-
-const views::Window* ExternalTabContainer::GetContainingWindow() const {
+views::Window* ExternalTabContainer::GetWindow() {
   return NULL;
 }
 
 bool ExternalTabContainer::AcceleratorPressed(
     const views::Accelerator& accelerator) {
   std::map<views::Accelerator, int>::const_iterator iter =
       accelerator_table_.find(accelerator);
   DCHECK(iter != accelerator_table_.end());
 
   if (!tab_contents_.get() || !tab_contents_->render_view_host()) {
@@ skipping 171 matching lines @@
 
   if (disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     disposition = NEW_FOREGROUND_TAB;
   }
   ExternalTabContainer::OpenURLFromTab(source, url, referrer, disposition,
                                        transition);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
 }