diff options
author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 04:12:18 +0000 |
---|---|---|
committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 04:12:18 +0000 |
commit | 0f2f4b60511540e292e085ba5e1985be6bf93908 (patch) | |
tree | 6d6bb042fe78bb23c4eca3cf4a4222a3dab38e74 /chrome/views/client_view.cc | |
parent | aaeb9dc745d49afa66c1b613daa5a3123f309955 (diff) | |
download | chromium_src-0f2f4b60511540e292e085ba5e1985be6bf93908.zip chromium_src-0f2f4b60511540e292e085ba5e1985be6bf93908.tar.gz chromium_src-0f2f4b60511540e292e085ba5e1985be6bf93908.tar.bz2 |
Window Delegate Improvements:
- Windows now must have a Delegate. Just construct the default WindowDelegate
if
you don't want to have to write one in testing.
- Windows now obtain their contents view by asking the delegate via
WindowDelegate::GetContentsView.
- Contents views no longer need to manually store a pointer to the Window that
contains them, WindowDelegate does this automatically via its window()
accessor.
Reviewer notes:
- review window_delegate.h first, then
- window.h/cc
- custom frame window.h/cc
- constrained_window_impl.h/cc
- then everything else (just updating all call sites)
B=1280060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/client_view.cc')
-rw-r--r-- | chrome/views/client_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/views/client_view.cc b/chrome/views/client_view.cc index 2ae6870..7bc7638 100644 --- a/chrome/views/client_view.cc +++ b/chrome/views/client_view.cc @@ -243,16 +243,16 @@ void ClientView::Layout() { void ClientView::ViewHierarchyChanged(bool is_add, View* parent, View* child) { if (is_add && child == this) { + // Can only add and update the dialog buttons _after_ they are added to the + // view hierarchy since they are native controls and require the + // ViewContainer's HWND. + ShowDialogButtons(); // Only add the contents_view_ once, and only when we ourselves are added // to the view hierarchy, since some contents_view_s assume that when they // are added to the hierarchy a HWND exists, when it may not, since we are // not yet added... if (contents_view_ && contents_view_->GetParent() != this) AddChildView(contents_view_); - // Can only add and update the dialog buttons _after_ they are added to the - // view hierarchy since they are native controls and require the - // ViewContainer's HWND. - ShowDialogButtons(); UpdateDialogButtons(); Layout(); } |