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

Unified Diff: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h

Issue 186343002: Create windows for new app window bounds API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nit Created 6 years, 9 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
Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index 25278368fd74b6c4293fc8c9e6300c5334942f1a..e7ca796889d51716a54bc9c86a7956302adb31b3 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -136,10 +136,10 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
virtual void ShowWithApp() OVERRIDE;
virtual void HideWithApp() OVERRIDE;
virtual void UpdateShelfMenu() OVERRIDE;
- virtual gfx::Size GetMinimumSize() const OVERRIDE;
- virtual void SetMinimumSize(const gfx::Size& size) OVERRIDE;
- virtual gfx::Size GetMaximumSize() const OVERRIDE;
- virtual void SetMaximumSize(const gfx::Size& size) OVERRIDE;
+ virtual gfx::Size GetContentMinimumSize() const OVERRIDE;
+ virtual void SetContentMinimumSize(const gfx::Size& size) OVERRIDE;
+ virtual gfx::Size GetContentMaximumSize() const OVERRIDE;
+ virtual void SetContentMaximumSize(const gfx::Size& size) OVERRIDE;
// WebContentsObserver implementation.
virtual void RenderViewCreated(content::RenderViewHost* rvh) OVERRIDE;
@@ -185,6 +185,11 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
// Cache |restored_bounds_| only if the window is currently restored.
void UpdateRestoredBounds();
+ // Update the minimum and maximum size constraints, fullscreen and resize
+ // controls.
+ void SetContentSizeConstraints(const gfx::Size& minimum_size,
+ const gfx::Size& maximum_size);
+
// Hides the window unconditionally. Used by Hide and HideWithApp.
void HideWithoutMarkingHidden();
@@ -203,6 +208,7 @@ class NativeAppWindowCocoa : public apps::NativeAppWindow,
bool is_fullscreen_;
NSRect restored_bounds_;
+ bool is_resizable_;
bool shows_resize_controls_;
bool shows_fullscreen_controls_;
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698