summaryrefslogtreecommitdiffstats
path: root/views/window/native_window_win.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 23:10:18 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-25 23:10:18 +0000
commit601160029a2e7d6f4f634e9b26331f510449209b (patch)
tree2c655d1e53e73a196a8151428505bbd6d482d7b5 /views/window/native_window_win.cc
parent24d692aa555b5673c3d6eb37252b6eec19f439b5 (diff)
downloadchromium_src-601160029a2e7d6f4f634e9b26331f510449209b.zip
chromium_src-601160029a2e7d6f4f634e9b26331f510449209b.tar.gz
chromium_src-601160029a2e7d6f4f634e9b26331f510449209b.tar.bz2
Adds a basic NativeWindowViews.
http://crbug.com/83663 TEST=none Review URL: http://codereview.chromium.org/7069022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/native_window_win.cc')
-rw-r--r--views/window/native_window_win.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/views/window/native_window_win.cc b/views/window/native_window_win.cc
index b7708d8..fed8173 100644
--- a/views/window/native_window_win.cc
+++ b/views/window/native_window_win.cc
@@ -22,7 +22,6 @@
#include "ui/gfx/path.h"
#include "views/accessibility/native_view_accessibility_win.h"
#include "views/window/client_view.h"
-#include "views/window/custom_frame_view.h"
#include "views/window/native_window_delegate.h"
#include "views/window/native_frame_view.h"
#include "views/window/non_client_view.h"
@@ -1308,9 +1307,8 @@ void NativeWindowWin::SetUseDragFrame(bool use_drag_frame) {
}
NonClientFrameView* NativeWindowWin::CreateFrameViewForWindow() {
- if (GetWindow()->ShouldUseNativeFrame())
- return new NativeFrameView(GetWindow());
- return new CustomFrameView(GetWindow());
+ return GetWindow()->ShouldUseNativeFrame() ?
+ new NativeFrameView(GetWindow()) : NULL;
}
void NativeWindowWin::UpdateFrameAfterFrameChange() {