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

Side by Side Diff: views/widget/widget.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/widget/widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef VIEWS_WIDGET_WIDGET_H_ 5 #ifndef VIEWS_WIDGET_WIDGET_H_
6 #define VIEWS_WIDGET_WIDGET_H_ 6 #define VIEWS_WIDGET_WIDGET_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <stack> 10 #include <stack>
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after
707 bool widget_closed_; 707 bool widget_closed_;
708 708
709 // The saved "show" state for this window. See note in SetInitialBounds 709 // The saved "show" state for this window. See note in SetInitialBounds
710 // that explains why we save this. 710 // that explains why we save this.
711 ui::WindowShowState saved_show_state_; 711 ui::WindowShowState saved_show_state_;
712 712
713 // The restored bounds used for the initial show. This is only used if 713 // The restored bounds used for the initial show. This is only used if
714 // |saved_show_state_| is maximized. 714 // |saved_show_state_| is maximized.
715 gfx::Rect initial_restored_bounds_; 715 gfx::Rect initial_restored_bounds_;
716 716
717 // The smallest size the user can resize the window.
718 gfx::Size minimum_size_;
719
720 // Focus is automatically set to the view provided by the delegate 717 // Focus is automatically set to the view provided by the delegate
721 // when the widget is shown. Set this value to false to override 718 // when the widget is shown. Set this value to false to override
722 // initial focus for the widget. 719 // initial focus for the widget.
723 bool focus_on_creation_; 720 bool focus_on_creation_;
724 721
725 scoped_ptr<InputMethod> input_method_; 722 scoped_ptr<InputMethod> input_method_;
726 723
727 // See |is_top_level()| accessor. 724 // See |is_top_level()| accessor.
728 bool is_top_level_; 725 bool is_top_level_;
729 726
(...skipping 10 matching lines...) Expand all
740 // duplicate move events even though the mouse hasn't moved. 737 // duplicate move events even though the mouse hasn't moved.
741 bool last_mouse_event_was_move_; 738 bool last_mouse_event_was_move_;
742 gfx::Point last_mouse_event_position_; 739 gfx::Point last_mouse_event_position_;
743 740
744 DISALLOW_COPY_AND_ASSIGN(Widget); 741 DISALLOW_COPY_AND_ASSIGN(Widget);
745 }; 742 };
746 743
747 } // namespace views 744 } // namespace views
748 745
749 #endif // VIEWS_WIDGET_WIDGET_H_ 746 #endif // VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698