Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1922)

Unified Diff: ui/views/view.cc

Issue 11775021: Removes debugging code I added to find crash. Crash seems to have (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 8914847a546087112affb4099a729154c576b357..a38ccb71afdc69bb0bbad15d554cf04de2d8b947 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);
« no previous file with comments | « ui/views/view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698