diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 00:26:30 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-16 00:26:30 +0000 |
| commit | 4d0bd1045bc0df8daea2a5626e73906cb074631b (patch) | |
| tree | 6794b895e236b68c2f7de1163dfb1c554646364c /chrome/views/native_control.cc | |
| parent | 7609533b68dcbeaa80bf712dd84726d1da8d3f8a (diff) | |
| download | chromium_src-4d0bd1045bc0df8daea2a5626e73906cb074631b.zip chromium_src-4d0bd1045bc0df8daea2a5626e73906cb074631b.tar.gz chromium_src-4d0bd1045bc0df8daea2a5626e73906cb074631b.tar.bz2 | |
Rename ViewContainer to Container and HWNDViewContainer to ContainerWin.
http://crbug.com/3430
Review URL: http://codereview.chromium.org/7376
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/native_control.cc')
| -rw-r--r-- | chrome/views/native_control.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/views/native_control.cc b/chrome/views/native_control.cc index db0403d..5c14c57 100644 --- a/chrome/views/native_control.cc +++ b/chrome/views/native_control.cc @@ -12,8 +12,8 @@ #include "base/win_util.h" #include "chrome/common/l10n_util.h" #include "chrome/views/border.h" +#include "chrome/views/container.h" #include "chrome/views/focus_manager.h" -#include "chrome/views/view_container.h" #include "chrome/views/hwnd_view.h" #include "chrome/views/background.h" #include "base/gfx/native_theme.h" @@ -36,7 +36,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer, explicit NativeControlContainer(NativeControl* parent) : parent_(parent), control_(NULL) { - Create(parent->GetViewContainer()->GetHWND()); + Create(parent->GetContainer()->GetHWND()); ::ShowWindow(m_hWnd, SW_SHOW); } @@ -199,14 +199,14 @@ void NativeControl::ValidateNativeControl() { void NativeControl::ViewHierarchyChanged(bool is_add, View *parent, View *child) { - if (is_add && GetViewContainer()) { + if (is_add && GetContainer()) { ValidateNativeControl(); Layout(); } } void NativeControl::Layout() { - if (!container_ && GetViewContainer()) + if (!container_ && GetContainer()) ValidateNativeControl(); if (hwnd_view_) { |