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

Side by Side Diff: ui/views/widget/widget.h

Issue 293833002: Fix Widget::InitParams::activatable logic (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | ui/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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_WIDGET_WIDGET_H_ 5 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
6 #define UI_VIEWS_WIDGET_WIDGET_H_ 6 #define UI_VIEWS_WIDGET_WIDGET_H_
7 7
8 #include <set> 8 #include <set>
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 bool widget_closed_; 875 bool widget_closed_;
876 876
877 // The saved "show" state for this window. See note in SetInitialBounds 877 // The saved "show" state for this window. See note in SetInitialBounds
878 // that explains why we save this. 878 // that explains why we save this.
879 ui::WindowShowState saved_show_state_; 879 ui::WindowShowState saved_show_state_;
880 880
881 // The restored bounds used for the initial show. This is only used if 881 // The restored bounds used for the initial show. This is only used if
882 // |saved_show_state_| is maximized. 882 // |saved_show_state_| is maximized.
883 gfx::Rect initial_restored_bounds_; 883 gfx::Rect initial_restored_bounds_;
884 884
885 // True if the widget can be activated.
886 bool can_activate_;
887
888 // Focus is automatically set to the view provided by the delegate 885 // Focus is automatically set to the view provided by the delegate
889 // when the widget is shown. Set this value to false to override 886 // when the widget is shown. Set this value to false to override
890 // initial focus for the widget. 887 // initial focus for the widget.
891 bool focus_on_creation_; 888 bool focus_on_creation_;
892 889
893 mutable scoped_ptr<InputMethod> input_method_; 890 mutable scoped_ptr<InputMethod> input_method_;
894 891
895 // See |is_top_level()| accessor. 892 // See |is_top_level()| accessor.
896 bool is_top_level_; 893 bool is_top_level_;
897 894
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 bool movement_disabled_; 927 bool movement_disabled_;
931 928
932 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 929 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
933 930
934 DISALLOW_COPY_AND_ASSIGN(Widget); 931 DISALLOW_COPY_AND_ASSIGN(Widget);
935 }; 932 };
936 933
937 } // namespace views 934 } // namespace views
938 935
939 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 936 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW
« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698