summaryrefslogtreecommitdiffstats
path: root/views/window/window.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/window.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/window.cc')
-rw-r--r--views/window/window.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/views/window/window.cc b/views/window/window.cc
index 7af6bfa..f2d51ee 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -14,6 +14,7 @@
#include "ui/gfx/size.h"
#include "views/widget/widget.h"
#include "views/widget/native_widget.h"
+#include "views/window/custom_frame_view.h"
#include "views/window/native_window.h"
#include "views/window/window_delegate.h"
@@ -229,7 +230,8 @@ void Window::SetIsAlwaysOnTop(bool always_on_top) {
}
NonClientFrameView* Window::CreateFrameViewForWindow() {
- return native_window_->CreateFrameViewForWindow();
+ NonClientFrameView* frame_view = native_window_->CreateFrameViewForWindow();
+ return frame_view ? frame_view : new CustomFrameView(this);
}
void Window::UpdateFrameAfterFrameChange() {