Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/external_tab_container_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 169 matching lines @@
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Returns the ExternalTabContainer instance associated with the cookie
   // passed in. It also erases the corresponding reference from the map.
   // Returns NULL if we fail to find the cookie in the map.
   static scoped_refptr<ExternalTabContainer> RemovePendingTab(uintptr_t cookie);
 
   // Overridden from views::WidgetWin:
-  virtual views::Window* GetContainingWindow() OVERRIDE;
-  virtual const views::Window* GetContainingWindow() const OVERRIDE;
+  virtual views::Window* GetWindow();
 
   // Handles the specified |accelerator| being pressed.
   bool AcceleratorPressed(const views::Accelerator& accelerator);
 
   bool pending() const {
     return pending_;
   }
 
   void set_pending(bool pending) {
     pending_ = pending;
@@ skipping 200 matching lines @@
     return false;
   }
 
   virtual void BeforeUnloadFired(TabContents* tab, bool proceed,
                                  bool* proceed_to_fire_unload) {
     NOTREACHED();
   }
 };
 
 #endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_