Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: apps/ui/views/native_app_window_views.cc

Issue 552313003: Make CanResize and CanMaximize depend on shape (WidgetHasHitTestMask). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/ui/views/native_app_window_views.cc
diff --git a/apps/ui/views/native_app_window_views.cc b/apps/ui/views/native_app_window_views.cc
index e069b3c5b9f8d01b6d2f39d7e0bf633f0b91d3d1..b053af5946115bd0983be38fe5ea69e03034a0b9 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 {
« no previous file with comments | « no previous file | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698