Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/views/frame/browser_frame.cc

Index: chrome/browser/ui/views/frame/browser_frame.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_frame.cc	(revision 85701)
+++ chrome/browser/ui/views/frame/browser_frame.cc	(working copy)
@@ -69,6 +69,22 @@
   browser_frame_view_->UpdateThrobber(running);
 }
 
+bool BrowserFrame::AlwaysUseNativeFrame() const {
+  // App panel windows draw their own frame.
+  if (browser_view_->IsBrowserTypePanel())
+    return false;
+
+  // 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() && 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).
+  return GetThemeProvider()->ShouldUseNativeFrame();
+}
+
 views::View* BrowserFrame::GetFrameView() const {
   return browser_frame_view_;
 }
@@ -104,7 +120,7 @@
 
 views::NonClientFrameView* BrowserFrame::CreateFrameViewForWindow() {
 #if defined(OS_WIN)
-  if (ShouldUseNativeFrame()) {
+  if (AlwaysUseNativeFrame()) {
     browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
   } else {
 #endif