Removes debugging code I added to find crash. Crash seems to have

disappeared, so removing debugging code.

BUG=166355
TEST=none


Review URL: https://chromiumcodereview.appspot.com/11775021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175641 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 13 deletions

diff --git a/ui/views/view.cc b/ui/views/view.cc
index 8914847..a38ccb7 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -126,8 +126,7 @@ View::View()
       focusable_(false),
       accessibility_focusable_(false),
       context_menu_controller_(NULL),
-      drag_controller_(NULL),
-      in_on_focus_(false) {
+      drag_controller_(NULL) {
 }
 
 View::~View() {
@@ -1328,11 +1327,8 @@ void View::OnFocus() {
   // By default, we clear the native focus. This ensures that no visible native
   // view as the focus and that we still receive keyboard inputs.
   FocusManager* focus_manager = GetFocusManager();
-  if (focus_manager) {
-    in_on_focus_ = true;
+  if (focus_manager)
     focus_manager->ClearNativeFocus();
-    in_on_focus_ = false;
-  }
 
   // TODO(beng): Investigate whether it's possible for us to move this to
   //             Focus().
@@ -1596,8 +1592,6 @@ void View::DoRemoveChildView(View* view,
 }
 
 void View::PropagateRemoveNotifications(View* parent) {
-  CHECK(!in_on_focus_);
-
   for (int i = 0, count = child_count(); i < count; ++i)
     child_at(i)->PropagateRemoveNotifications(parent);
 
diff --git a/ui/views/view.h b/ui/views/view.h
index 7017e93..1d0f564 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -1493,11 +1493,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
       native_view_accessibility_win_;
 #endif
 
-  // For debugging a crash (http://crbug.com/166355). If true we're in
-  // OnFocus().
-  // TODO(sky): nuke this.
-  bool in_on_focus_;
-
   DISALLOW_COPY_AND_ASSIGN(View);
 };