Widget::ShouldUseNativeFrame is now meaningful on Linux.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
@@ skipping 496 matching lines @@
             browser_actions_->GetPreferredSize().width() +
             app_menu_->GetPreferredSize().width() + kRightEdgeSpacing,
         0);
     gfx::ImageSkia* normal_background =
         GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     size.SetToMax(
         gfx::Size(0, normal_background->height() - content_shadow_height()));
   } else {
     const int kPopupBottomSpacingGlass = 1;
     const int kPopupBottomSpacingNonGlass = 2;
-    size.Enlarge(
-        0,
-        PopupTopSpacing() + (GetWidget()->ShouldUseNativeFrame() ?
-            kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass));
+    size.Enlarge(0,
+                 PopupTopSpacing() + (UsingWindowsGlass()
+                                          ? kPopupBottomSpacingGlass
+                                          : kPopupBottomSpacingNonGlass));
   }
   return size;
 }
 
 void ToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
   if (back_ == NULL)
     return;
 
   if (!is_display_mode_normal()) {
@@ skipping 118 matching lines @@
 void ToolbarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (is_display_mode_normal())
     return;
 
   // For glass, we need to draw a black line below the location bar to separate
   // it from the content area.  For non-glass, the NonClientView draws the
   // toolbar background below the location bar for us.
   // NOTE: Keep this in sync with BrowserView::GetInfoBarSeparatorColor()!
-  if (GetWidget()->ShouldUseNativeFrame())
+  if (UsingWindowsGlass())
     canvas->FillRect(gfx::Rect(0, height() - 1, width(), 1), SK_ColorBLACK);
 }
 
 void ToolbarView::OnThemeChanged() {
   LoadImages();
 }
 
 const char* ToolbarView::GetClassName() const {
   return kViewClassName;
 }
@@ skipping 55 matching lines @@
   EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
   loaded_modules->MaybePostScanningTask();
   return loaded_modules->ShouldShowConflictWarning();
 #else
   return false;
 #endif
 }
 
 int ToolbarView::PopupTopSpacing() const {
   const int kPopupTopSpacingNonGlass = 3;
-  return GetWidget()->ShouldUseNativeFrame() ? 0 : kPopupTopSpacingNonGlass;
+  return UsingWindowsGlass() ? 0 : kPopupTopSpacingNonGlass;
+}
+
+bool ToolbarView::UsingWindowsGlass() const {
+#if defined(OS_WIN)
+  return GetWidget()->ShouldUseNativeFrame();
+#endif
+return false;
 }
 
 void ToolbarView::LoadImages() {
   ui::ThemeProvider* tp = GetThemeProvider();
 
   back_->SetImage(views::Button::STATE_NORMAL,
                   *(tp->GetImageSkiaNamed(IDR_BACK)));
   back_->SetImage(views::Button::STATE_DISABLED,
                   *(tp->GetImageSkiaNamed(IDR_BACK_D)));
 
@@ skipping 80 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }