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

Unified Diff: ui/aura/window.h

Issue 8574049: [Aura] Fix HtmlDialogBrowserTest.SizeWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 9 years, 1 month 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 | « ui/aura/test/test_window_delegate.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 53f4dea61f579726ccbcc7e5fe0b4a607e9d10be..6c53603f80886e945b110e7e6a3f1f7eb86bfe1d 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -118,13 +118,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
// not animating, it simply returns the current bounds.
gfx::Rect GetTargetBounds() const;
- // Sets the minimum size of the window that a user can resize it to.
- // A smaller size can still be set using SetBounds().
- void set_minimum_size(const gfx::Size& minimum_size) {
- minimum_size_ = minimum_size;
- }
- const gfx::Size& minimum_size() const { return minimum_size_; }
-
// Marks the a portion of window as needing to be painted.
void SchedulePaintInRect(const gfx::Rect& rect);
@@ -302,9 +295,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
WindowDelegate* delegate_;
- // The minimum size of the window a user can resize to.
- gfx::Size minimum_size_;
-
scoped_ptr<ui::Layer> layer_;
// The Window's parent.
« no previous file with comments | « ui/aura/test/test_window_delegate.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698