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

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

Issue 1489843003: [WIP: Not for review] Simplify and unify widget/window show logic Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 void SetInitialBounds(const gfx::Rect& bounds); 852 void SetInitialBounds(const gfx::Rect& bounds);
853 853
854 // Sizes and positions the frameless window just after it is created. 854 // Sizes and positions the frameless window just after it is created.
855 void SetInitialBoundsForFramelessWindow(const gfx::Rect& bounds); 855 void SetInitialBoundsForFramelessWindow(const gfx::Rect& bounds);
856 856
857 // Returns the bounds and "show" state from the delegate. Returns true if 857 // Returns the bounds and "show" state from the delegate. Returns true if
858 // the delegate wants to use a specified bounds. 858 // the delegate wants to use a specified bounds.
859 bool GetSavedWindowPlacement(gfx::Rect* bounds, 859 bool GetSavedWindowPlacement(gfx::Rect* bounds,
860 ui::WindowShowState* show_state); 860 ui::WindowShowState* show_state);
861 861
862 void ShowWithCurrentState();
863
862 internal::NativeWidgetPrivate* native_widget_; 864 internal::NativeWidgetPrivate* native_widget_;
863 865
864 // If non-null, the native theme for this widget. Otherwise the native theme 866 // If non-null, the native theme for this widget. Otherwise the native theme
865 // comes from |native_widget_|. 867 // comes from |native_widget_|.
866 ui::NativeTheme* native_theme_; 868 ui::NativeTheme* native_theme_;
867 869
868 base::ObserverList<WidgetObserver> observers_; 870 base::ObserverList<WidgetObserver> observers_;
869 871
870 base::ObserverList<WidgetRemovalsObserver> removals_observers_; 872 base::ObserverList<WidgetRemovalsObserver> removals_observers_;
871 873
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 bool movement_disabled_; 967 bool movement_disabled_;
966 968
967 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_; 969 ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
968 970
969 DISALLOW_COPY_AND_ASSIGN(Widget); 971 DISALLOW_COPY_AND_ASSIGN(Widget);
970 }; 972 };
971 973
972 } // namespace views 974 } // namespace views
973 975
974 #endif // UI_VIEWS_WIDGET_WIDGET_H_ 976 #endif // UI_VIEWS_WIDGET_WIDGET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698