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/focus_manager.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/focus_manager.cc')
| -rw-r--r-- | chrome/views/focus_manager.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/views/focus_manager.cc b/chrome/views/focus_manager.cc index 8af3542..397a4a8 100644 --- a/chrome/views/focus_manager.cc +++ b/chrome/views/focus_manager.cc @@ -9,10 +9,10 @@ #include "chrome/browser/render_widget_host_view_win.h" #include "chrome/common/notification_types.h" #include "chrome/views/accelerator.h" +#include "chrome/views/container.h" #include "chrome/views/focus_manager.h" #include "chrome/views/root_view.h" #include "chrome/views/view.h" -#include "chrome/views/view_container.h" #include "chrome/views/view_storage.h" // The following keys are used in SetProp/GetProp to associate additional @@ -304,7 +304,7 @@ bool FocusManager::OnKeyDown(HWND window, UINT message, WPARAM wparam, DCHECK((message == WM_KEYDOWN) || (message == WM_SYSKEYDOWN)); if (!IsWindowVisible(root_)) { - // We got a message for a hidden window. Because HWNDViewContainer::Close + // We got a message for a hidden window. Because ContainerWin::Close // hides the window, then destroys it, it it possible to get a message after // we've hidden the window. If we allow the message to be dispatched // chances are we'll crash in some weird place. By returning false we make @@ -425,7 +425,7 @@ bool FocusManager::ContainsView(View* view) { if (!root_view) return false; - ViewContainer* view_container = root_view->GetViewContainer(); + Container* view_container = root_view->GetContainer(); if (!view_container) return false; @@ -457,7 +457,7 @@ View* FocusManager::GetNextFocusableView(View* original_starting_view, View* starting_view = NULL; if (original_starting_view) { // If the starting view has a focus traversable, use it. - // This is the case with HWNDViewContainers for example. + // This is the case with ContainerWins for example. focus_traversable = original_starting_view->GetFocusTraversable(); // Otherwise default to the root view. |