diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 18:48:00 +0000 |
| commit | 82166b65c8cdd7cb855c2d018be8c6c815324af6 (patch) | |
| tree | f96034ed91ce66d6a3ba2afa07cdd4be1e55b264 /views/focus/external_focus_tracker.cc | |
| parent | 7811b768ff61d58153a198a273cdb39581a77542 (diff) | |
| download | chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.zip chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.gz chromium_src-82166b65c8cdd7cb855c2d018be8c6c815324af6.tar.bz2 | |
This CL removes the last (major) Windows specific part out of the focus manager.
It was previously landed and reverted because it broke the reliability tests.
http://codereview.chromium.org/125148
The breakage was caused by constrained windows not getting a hold of the FocusManager when in unparented tabs.
The fix is to ensure unparented tab still have a way to access their FocusManager for proper closure.
Files changed from the previous patch that need reviewing:
native_tab_contents_container_win.cc
tab_contents_view_win.h
tab_contents_view_win.cc
BUG=None
TEST=Run all tests (unit, ui, interactive). Extensively test the focus in Chrome.
Review URL: http://codereview.chromium.org/146093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/external_focus_tracker.cc')
| -rw-r--r-- | views/focus/external_focus_tracker.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/views/focus/external_focus_tracker.cc b/views/focus/external_focus_tracker.cc index 8f8bfdf..b08d287 100644 --- a/views/focus/external_focus_tracker.cc +++ b/views/focus/external_focus_tracker.cc @@ -4,6 +4,7 @@ #include "views/focus/external_focus_tracker.h" +#include "base/logging.h" #include "views/view.h" #include "views/focus/view_storage.h" @@ -13,6 +14,8 @@ ExternalFocusTracker::ExternalFocusTracker(View* parent_view, FocusManager* focus_manager) : focus_manager_(focus_manager), parent_view_(parent_view) { + DCHECK(focus_manager); + DCHECK(parent_view); view_storage_ = ViewStorage::GetSharedInstance(); last_focused_view_storage_id_ = view_storage_->CreateStorageID(); // Store the view which is focused when we're created. |