diff options
| author | jackhou <jackhou@chromium.org> | 2014-09-12 02:40:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 09:47:28 +0000 |
| commit | e163ac2ad78d8047bcae08d581d5921e5685f086 (patch) | |
| tree | 6920cfc500de7d57af66bab2e4f1b373da0d2cd1 /apps | |
| parent | c3335323f09a566cb6a78f424dd7c52966e13b31 (diff) | |
| download | chromium_src-e163ac2ad78d8047bcae08d581d5921e5685f086.zip chromium_src-e163ac2ad78d8047bcae08d581d5921e5685f086.tar.gz chromium_src-e163ac2ad78d8047bcae08d581d5921e5685f086.tar.bz2 | |
Make CanResize and CanMaximize depend on shape (WidgetHasHitTestMask).
This makes windows with a shape implicitly non-resizable and
non-maximizable.
BUG=408737
Review URL: https://codereview.chromium.org/552313003
Cr-Commit-Position: refs/heads/master@{#294563}
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ui/views/native_app_window_views.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/ui/views/native_app_window_views.cc b/apps/ui/views/native_app_window_views.cc index e069b3c..b053af5 100644 --- a/apps/ui/views/native_app_window_views.cc +++ b/apps/ui/views/native_app_window_views.cc @@ -192,12 +192,13 @@ views::View* NativeAppWindowViews::GetInitiallyFocusedView() { } bool NativeAppWindowViews::CanResize() const { - return resizable_ && !size_constraints_.HasFixedSize(); + return resizable_ && !size_constraints_.HasFixedSize() && + !WidgetHasHitTestMask(); } bool NativeAppWindowViews::CanMaximize() const { return resizable_ && !size_constraints_.HasMaximumSize() && - !app_window_->window_type_is_panel(); + !app_window_->window_type_is_panel() && !WidgetHasHitTestMask(); } base::string16 NativeAppWindowViews::GetWindowTitle() const { |