Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
index 1be2fd95de452510369ec9e0549937ae1673ef92..bab33391cf34134cfff6156f6c8607c4da16c653 100644 |
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
@@ -553,15 +553,8 @@ views::NonClientFrameView* ChromeNativeAppWindowViews::CreateNonClientFrameView( |
return custom_frame_view; |
} |
#endif |
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
- // Linux always uses the non standard frame view because the OS draws the |
- // frame (if a frame is needed). |
- return CreateNonStandardAppFrame(); |
-#else |
- if (IsFrameless() || has_frame_color_) |
- return CreateNonStandardAppFrame(); |
-#endif |
- return CreateStandardDesktopAppFrame(); |
+ return (IsFrameless() || has_frame_color_) ? |
+ CreateNonStandardAppFrame() : CreateStandardDesktopAppFrame(); |
} |
bool ChromeNativeAppWindowViews::WidgetHasHitTestMask() const { |