Lands http://codereview.chromium.org/193032 for Charlie:...

views/controls/native_control_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
 #include "views/controls/native_control_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "views/focus/focus_manager.h"
@@ skipping 58 matching lines @@
                    G_CALLBACK(CallFocusIn), this);
 }
 
 // static
 void NativeControlGtk::CallFocusIn(GtkWidget* widget,
                                    GdkEventFocus* event,
                                    NativeControlGtk* control) {
   FocusManager* focus_manager =
       FocusManager::GetFocusManagerForNativeView(widget);
   if (!focus_manager) {
-    NOTREACHED();
+    // TODO(jcampan): http://crbug.com/21378 Reenable this NOTREACHED() when the
+    // options page is only based on views.
+    // NOTREACHED();
     return;
   }
   focus_manager->SetFocusedView(control->focus_view());
 }
 
 }  // namespace views