diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 23:57:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-22 23:57:32 +0000 |
| commit | 6b78e39fdcccb035283a2cac91580b3328016184 (patch) | |
| tree | 17d0f7451e2e6f713516025c7a3622bb2d1b8eea /views | |
| parent | 75c023cd5170f47a2e19fd4d77f7e404b3c22e91 (diff) | |
| download | chromium_src-6b78e39fdcccb035283a2cac91580b3328016184.zip chromium_src-6b78e39fdcccb035283a2cac91580b3328016184.tar.gz chromium_src-6b78e39fdcccb035283a2cac91580b3328016184.tar.bz2 | |
Reverts debugging code added @ 97412 as it uncovered reason for crash.
R=ben@chromium.org
TBR=ben@chromium.org
BUG=89439
TEST=none
Review URL: http://codereview.chromium.org/7710003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/views/view.cc b/views/view.cc index 75a93b1..22cdeb2 100644 --- a/views/view.cc +++ b/views/view.cc @@ -83,9 +83,6 @@ ViewsDelegate* ViewsDelegate::views_delegate = NULL; // static char View::kViewClassName[] = "views/View"; -// TODO(sky): remove this when we figure out 89439. -static View* view_being_focused_ = NULL; - //////////////////////////////////////////////////////////////////////////////// // View, public: @@ -124,8 +121,6 @@ View::View() } View::~View() { - CHECK_NE(view_being_focused_, this); - if (parent_) parent_->RemoveChildView(this); @@ -985,11 +980,8 @@ FocusManager* View::GetFocusManager() { void View::RequestFocus() { FocusManager* focus_manager = GetFocusManager(); - if (focus_manager && IsFocusableInRootView()) { - view_being_focused_ = this; + if (focus_manager && IsFocusableInRootView()) focus_manager->SetFocusedView(this); - view_being_focused_ = NULL; - } } bool View::SkipDefaultKeyEventProcessing(const KeyEvent& event) { |