summaryrefslogtreecommitdiffstats
path: root/ash/shell
diff options
context:
space:
mode:
authordslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:02:59 +0000
committerdslomov@chromium.org <dslomov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:02:59 +0000
commit522950484ee7dceb34da9b8b103571d2a61dd684 (patch)
treef08bea2aa7d39e680a173661c9184718c4178764 /ash/shell
parentbbcdb78e98f7698457656059affcc3e3fc74aeb7 (diff)
downloadchromium_src-522950484ee7dceb34da9b8b103571d2a61dd684.zip
chromium_src-522950484ee7dceb34da9b8b103571d2a61dd684.tar.gz
chromium_src-522950484ee7dceb34da9b8b103571d2a61dd684.tar.bz2
Custom frame view for panels.
BUG=112195 TEST= Review URL: http://codereview.chromium.org/9310037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell')
-rw-r--r--ash/shell/panel_window.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc
index 5cfaffa..c5d0c7c 100644
--- a/ash/shell/panel_window.cc
+++ b/ash/shell/panel_window.cc
@@ -4,6 +4,7 @@
#include "ash/shell/panel_window.h"
+#include "ash/wm/panel_frame_view.h"
#include "ash/wm/toplevel_frame_view.h"
#include "base/utf_string_conversions.h"
#include "ui/aura/window.h"
@@ -75,10 +76,7 @@ bool PanelWindow::CanMaximize() const {
}
views::NonClientFrameView* PanelWindow::CreateNonClientFrameView() {
- // TODO(stevenjb): Implement a custom frame view for panels.
- // For now, use the default frame view (views::CustomFrameView)
- // which implements close and resize for us.
- return NULL;
+ return new PanelFrameView();
}
} // namespace ash