Re-land:

chrome/browser/ui/views/frame/browser_frame.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_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame_delegate.h"
+#include "views/window/window.h"
 
 class AeroGlassNonClientView;
 class BrowserNonClientFrameView;
 class BrowserRootView;
 class BrowserView;
 class NativeBrowserFrame;
 class NonClientFrameView;
 class Profile;
 
 namespace gfx {
 class Font;
 class Rect;
 }
 
 namespace ui {
 class ThemeProvider;
 }
 
 namespace views {
 class View;
 class Window;
 }
 
 // This is a virtual interface that allows system specific browser frames.
-class BrowserFrame : public NativeBrowserFrameDelegate {
+class BrowserFrame : public views::Window {
  public:
+  explicit BrowserFrame(BrowserView* browser_view);
   virtual ~BrowserFrame();
 
-  // Creates the appropriate BrowserFrame for this platform. The returned
-  // object is owned by the caller.
-  static BrowserFrame* Create(BrowserView* browser_view, Profile* profile);
-
   static const gfx::Font& GetTitleFont();
 
-  // Returns the Window associated with this frame. Guaranteed non-NULL after
-  // construction.
-  views::Window* GetWindow();
+  // Initialize the frame (creates the underlying native window).
+  void InitBrowserFrame();
 
   // Determine the distance of the left edge of the minimize button from the
   // left edge of the window. Used in our Non-Client View's Layout.
   int GetMinimizeButtonOffset() const;
 
   // Retrieves the bounds, in non-client view coordinates for the specified
   // TabStrip view.
   gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const;
 
   // Returns the y coordinate within the window at which the horizontal TabStrip
   // begins (or would begin).  If |restored| is true, this is calculated as if
   // we were in restored mode regardless of the current mode.
   int GetHorizontalTabStripVerticalOffset(bool restored) const;
 
   // Tells the frame to update the throbber.
   void UpdateThrobber(bool running);
 
-  // Returns the theme provider for this frame.
-  ui::ThemeProvider* GetThemeProviderForFrame() const;
-
   // Returns true if the window should use the native frame view. This is true
   // if there are no themes applied on Vista, or if there are themes applied and
   // this browser window is an app or popup.
   bool AlwaysUseNativeFrame() const;
 
   // Returns the NonClientFrameView of this frame.
   views::View* GetFrameView() const;
 
   // Notifies the frame that the tab strip display mode changed so it can update
   // its frame treatment if necessary.
   void TabStripDisplayModeChanged();
 
- protected:
-  // Overridden from NativeBrowserFrameDelegate:
-  virtual views::RootView* DelegateCreateRootView() OVERRIDE;
-  virtual views::NonClientFrameView* DelegateCreateFrameViewForWindow()
-      OVERRIDE;
-
-  // TODO(beng): Temporarily provided as a way to associate the subclass'
-  //             implementation of NativeBrowserFrame with this.
-  void set_native_browser_frame(NativeBrowserFrame* native_browser_frame) {
-    native_browser_frame_ = native_browser_frame;
-  }
-
-  explicit BrowserFrame(BrowserView* browser_view);
+  // Overridden from views::Window:
+  virtual bool IsMaximized() const OVERRIDE;
+  virtual views::RootView* CreateRootView() OVERRIDE;
+  virtual views::NonClientFrameView* CreateFrameViewForWindow() OVERRIDE;
+  virtual bool GetAccelerator(int command_id,
+                              ui::Accelerator* accelerator) OVERRIDE;
+  virtual ui::ThemeProvider* GetThemeProvider() const OVERRIDE;
+  virtual void OnNativeWindowActivationChanged(bool active) OVERRIDE;
 
  private:
   NativeBrowserFrame* native_browser_frame_;
 
   // A weak reference to the root view associated with the window. We save a
   // copy as a BrowserRootView to avoid evil casting later, when we need to call
   // functions that only exist on BrowserRootView (versus RootView).
   BrowserRootView* root_view_;
 
   // A pointer to our NonClientFrameView as a BrowserNonClientFrameView.
   BrowserNonClientFrameView* browser_frame_view_;
 
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_