From 14d01544d4710a8ddd9629b5e5cf0c16c6b630f9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 12 Nov 2014 14:33:30 +0800 Subject: [PATCH] Tidy code in CreateNonClientFrameView --- atom/browser/native_window_views.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc index 46b3dae3f4d9..dd0e662d5f5c 100644 --- a/atom/browser/native_window_views.cc +++ b/atom/browser/native_window_views.cc @@ -675,20 +675,18 @@ views::ClientView* NativeWindowViews::CreateClientView(views::Widget* widget) { views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView( views::Widget* widget) { #if defined(OS_WIN) - WinFrameView* frame_view = new WinFrameView; - frame_view->Init(this, widget); - return frame_view; -#elif defined(OS_LINUX) + WinFrameView* frame_view = new WinFrameView; + frame_view->Init(this, widget); + return frame_view; +#else if (has_frame_) { return new views::NativeFrameView(widget); } else { - FramelessView* frame_view = new FramelessView; + FramelessView* frame_view = new FramelessView; frame_view->Init(this, widget); return frame_view; } #endif - - return NULL; } gfx::ImageSkia NativeWindowViews::GetDevToolsWindowIcon() {