| Index: apps/ui/views/app_window_frame_view.cc
|
| diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
|
| index 5fcef4209af13c9869017bb71595b742a8bbcdbe..12e74c95f6ce6c99c6d951dad98d96ab59fb5aed 100644
|
| --- a/apps/ui/views/app_window_frame_view.cc
|
| +++ b/apps/ui/views/app_window_frame_view.cc
|
| @@ -29,8 +29,11 @@
|
| #endif
|
|
|
| namespace {
|
| -// Height of the chrome-style caption, in pixels.
|
| +
|
| +const int kDefaultResizeInsideBoundsSize = 5;
|
| +const int kDefaultResizeAreaCornerSize = 16;
|
| const int kCaptionHeight = 25;
|
| +
|
| } // namespace
|
|
|
| namespace apps {
|
| @@ -38,35 +41,21 @@ namespace apps {
|
| const char AppWindowFrameView::kViewClassName[] =
|
| "browser/ui/views/extensions/AppWindowFrameView";
|
|
|
| -AppWindowFrameView::AppWindowFrameView()
|
| - : widget_(NULL),
|
| - window_(NULL),
|
| +AppWindowFrameView::AppWindowFrameView(views::Widget* widget,
|
| + NativeAppWindow* window,
|
| + bool draw_frame,
|
| + const SkColor& frame_color)
|
| + : widget_(widget),
|
| + window_(window),
|
| + draw_frame_(draw_frame),
|
| + frame_color_(frame_color),
|
| close_button_(NULL),
|
| maximize_button_(NULL),
|
| restore_button_(NULL),
|
| minimize_button_(NULL),
|
| - resize_inside_bounds_size_(0),
|
| + resize_inside_bounds_size_(kDefaultResizeInsideBoundsSize),
|
| resize_outside_bounds_size_(0),
|
| - resize_area_corner_size_(0) {}
|
| -
|
| -AppWindowFrameView::~AppWindowFrameView() {}
|
| -
|
| -void AppWindowFrameView::Init(views::Widget* widget,
|
| - NativeAppWindow* window,
|
| - bool draw_frame,
|
| - const SkColor& frame_color,
|
| - int resize_inside_bounds_size,
|
| - int resize_outside_bounds_size,
|
| - int resize_outside_scale_for_touch,
|
| - int resize_area_corner_size) {
|
| - widget_ = widget;
|
| - window_ = window;
|
| - draw_frame_ = draw_frame;
|
| - frame_color_ = frame_color;
|
| - resize_inside_bounds_size_ = resize_inside_bounds_size;
|
| - resize_outside_bounds_size_ = resize_outside_bounds_size;
|
| - resize_area_corner_size_ = resize_area_corner_size;
|
| -
|
| + resize_area_corner_size_(kDefaultResizeAreaCornerSize) {
|
| if (draw_frame) {
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| close_button_ = new views::ImageButton(this);
|
| @@ -127,6 +116,16 @@ void AppWindowFrameView::Init(views::Widget* widget,
|
| }
|
| }
|
|
|
| +AppWindowFrameView::~AppWindowFrameView() {}
|
| +
|
| +void AppWindowFrameView::SetResizeSizes(int resize_inside_bounds_size,
|
| + int resize_outside_bounds_size,
|
| + int resize_area_corner_size) {
|
| + resize_inside_bounds_size_ = resize_inside_bounds_size;
|
| + resize_outside_bounds_size_ = resize_outside_bounds_size;
|
| + resize_area_corner_size_ = resize_area_corner_size;
|
| +}
|
| +
|
| // views::NonClientFrameView implementation.
|
|
|
| gfx::Rect AppWindowFrameView::GetBoundsForClientView() const {
|
|
|