Revert 85666 - Consolidate ShouldUseNativeFrame/AlwaysUseNativeFrame/UseNativeFrame spaghetti.

chrome/browser/ui/views/frame/browser_frame.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/ui/views/frame/browser_frame.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 51 matching lines @@
 }
 
 int BrowserFrame::GetHorizontalTabStripVerticalOffset(bool restored) const {
   return browser_frame_view_->GetHorizontalTabStripVerticalOffset(restored);
 }
 
 void BrowserFrame::UpdateThrobber(bool running) {
   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_;
 }
 
 void BrowserFrame::TabStripDisplayModeChanged() {
   if (GetRootView()->has_children()) {
     // Make sure the child of the root view gets Layout again.
     GetRootView()->GetChildViewAt(0)->InvalidateLayout();
   }
   GetRootView()->Layout();
@@ skipping 15 matching lines @@
 
 views::RootView* BrowserFrame::CreateRootView() {
   root_view_ = new BrowserRootView(
       browser_view_,
       native_browser_frame_->AsNativeWindow()->AsNativeWidget()->GetWidget());
   return root_view_;
 }
 
 views::NonClientFrameView* BrowserFrame::CreateFrameViewForWindow() {
 #if defined(OS_WIN)
-  if (ShouldUseNativeFrame()) {
+  if (AlwaysUseNativeFrame()) {
     browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
   } else {
 #endif
     browser_frame_view_ =
         browser::CreateBrowserNonClientFrameView(this, browser_view_);
 #if defined(OS_WIN)
   }
 #endif
   return browser_frame_view_;
 }
@@ skipping 14 matching lines @@
     // active on the users desktop, then none of the windows contained in the
     // remote desktop will be activated.  However, WindowWin::Activate will
     // still bring this browser window to the foreground.  We explicitly set
     // ourselves as the last active browser window to ensure that we get treated
     // as such by the rest of Chrome.
     BrowserList::SetLastActive(browser_view_->browser());
   }
   Window::OnNativeWindowActivationChanged(active);
 }