diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 01:21:01 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 01:21:01 +0000 |
| commit | 1ec87abd0442cd66b55725a9a188ee3182a3c339 (patch) | |
| tree | 01809c087899087e9f0111e9d1327eedd62f68db /chrome/views/custom_frame_window.cc | |
| parent | f3181317c218aceb35bd3324d5c796901b7b657f (diff) | |
| download | chromium_src-1ec87abd0442cd66b55725a9a188ee3182a3c339.zip chromium_src-1ec87abd0442cd66b55725a9a188ee3182a3c339.tar.gz chromium_src-1ec87abd0442cd66b55725a9a188ee3182a3c339.tar.bz2 | |
Move some methods from public to protected, since only subclasses should be calling them.
Move some data members from protected to private and provide a protected setter, per C++ style guidelines.
B=1293984
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/custom_frame_window.cc')
| -rw-r--r-- | chrome/views/custom_frame_window.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc index 28146b6..928947e 100644 --- a/chrome/views/custom_frame_window.cc +++ b/chrome/views/custom_frame_window.cc @@ -866,9 +866,9 @@ void CustomFrameWindow::Init(HWND parent, const gfx::Rect& bounds) { ResetWindowRegion(); } -void CustomFrameWindow::SetClientView(ClientView* client_view) { - DCHECK(client_view && !client_view_ && GetHWND()); - client_view_ = client_view; +void CustomFrameWindow::SetClientView(ClientView* cv) { + DCHECK(cv && !client_view() && GetHWND()); + set_client_view(cv); // For a CustomFrameWindow, the non-client view is the root. HWNDViewContainer::SetContentsView(non_client_view_); // When the non client view is added to the view hierarchy, it will cause the @@ -895,7 +895,7 @@ void CustomFrameWindow::EnableClose(bool enable) { void CustomFrameWindow::SizeWindowToDefault() { CSize pref(0, 0); - client_view_->GetPreferredSize(&pref); + client_view()->GetPreferredSize(&pref); DCHECK(pref.cx > 0 && pref.cy > 0); gfx::Size window_size = non_client_view_->CalculateWindowSizeForClientSize(pref.cx, pref.cy); |