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

Unified Diff: chrome/browser/ui/views/extensions/shell_window_views.cc

Issue 9452008: Allow platform apps to specify a maximum size for the shell container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing file Created 8 years, 10 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/common/extensions/extension.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/extensions/shell_window_views.cc
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
index a53733f10e15e0a4067d83b30cd962fcb4b1c173..524a37e0273bf1d8cd73a9bd6169d43ea17afb1d 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -40,13 +40,16 @@ class ShellWindowFrameView : public views::NonClientFrameView {
virtual void ResetWindowControls() OVERRIDE {}
virtual void UpdateWindowIcon() OVERRIDE {}
virtual gfx::Size GetMinimumSize() OVERRIDE;
+ virtual gfx::Size GetMaximumSize() OVERRIDE;
void set_min_size(gfx::Size size) { min_size_ = size; }
+ void set_max_size(gfx::Size size) { max_size_ = size; }
private:
DISALLOW_COPY_AND_ASSIGN(ShellWindowFrameView);
gfx::Size min_size_;
+ gfx::Size max_size_;
};
ShellWindowFrameView::ShellWindowFrameView(): min_size_() {
@@ -100,6 +103,9 @@ gfx::Size ShellWindowFrameView::GetMinimumSize() {
return min_size_;
}
+gfx::Size ShellWindowFrameView::GetMaximumSize() {
+ return max_size_;
+}
ShellWindowViews::ShellWindowViews(ExtensionHost* host)
: ShellWindow(host) {
@@ -150,9 +156,12 @@ views::View* ShellWindowViews::GetContentsView() {
views::NonClientFrameView* ShellWindowViews::CreateNonClientFrameView() {
ShellWindowFrameView* frame_view = new ShellWindowFrameView();
- gfx::Size size(host_->extension()->launch_min_width(),
- host_->extension()->launch_min_height());
- frame_view->set_min_size(size);
+ gfx::Size min_size(host_->extension()->launch_min_width(),
+ host_->extension()->launch_min_height());
+ gfx::Size max_size(host_->extension()->launch_max_width(),
+ host_->extension()->launch_max_height());
+ frame_view->set_min_size(min_size);
+ frame_view->set_max_size(max_size);
return frame_view;
}
« no previous file with comments | « no previous file | chrome/common/extensions/extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698