Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3370)

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

Issue 274273004: Use the native frame for the task manager on Linux Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed mgiuca@'s nits Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698