Revert 85528 - We were returning the wrong value of ShouldUseNativeFrame for popup windows when a theme is installed and the rest of the desktop is in glass mode.

We were returning false instead of true, even though themes are applied only to tabbed browser windows. This means that even though the window was rendered using the glass frame (due to a correct check somewhere else) the widget calculated the client size incorrectly.

http://crbug.com/80774
TEST=none
Review URL: http://codereview.chromium.org/7015057

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7034019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85536 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 8 deletions

diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index f790da9..0b0842e 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -77,10 +77,8 @@ bool BrowserFrame::AlwaysUseNativeFrame() const {
   // We don't theme popup or app windows, so regardless of whether or not a
   // theme is active for normal browser windows, we don't want to use the custom
   // frame for popups/apps.
-  if (!browser_view_->IsBrowserTypeNormal() &&
-      views::Window::ShouldUseNativeFrame()) {
+  if (!browser_view_->IsBrowserTypeNormal() && ShouldUseNativeFrame())
     return true;
-  }
 
   // Otherwise, we use the native frame when we're told we should by the theme
   // provider (e.g. no custom theme is active).
@@ -157,7 +155,3 @@ void BrowserFrame::OnNativeWindowActivationChanged(bool active) {
   Window::OnNativeWindowActivationChanged(active);
 }
 
-bool BrowserFrame::ShouldUseNativeFrame() const {
-  return AlwaysUseNativeFrame();
-}
-
diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h
index 43f709a..2c07fd2 100644
--- a/chrome/browser/ui/views/frame/browser_frame.h
+++ b/chrome/browser/ui/views/frame/browser_frame.h
@@ -81,7 +81,6 @@ class BrowserFrame : public views::Window {
                               ui::Accelerator* accelerator) OVERRIDE;
   virtual ui::ThemeProvider* GetThemeProvider() const OVERRIDE;
   virtual void OnNativeWindowActivationChanged(bool active) OVERRIDE;
-  virtual bool ShouldUseNativeFrame() const OVERRIDE;
 
  private:
   NativeBrowserFrame* native_browser_frame_;