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

views/focus/focus_manager_gtk.cc

Index: views/focus/focus_manager_gtk.cc
===================================================================
--- views/focus/focus_manager_gtk.cc	(revision 26217)
+++ views/focus/focus_manager_gtk.cc	(working copy)
@@ -20,7 +20,7 @@
     gtk_widget_grab_focus(native_view);
 }
 
- // static
+// static
 FocusManager* FocusManager::GetFocusManagerForNativeView(
     gfx::NativeView native_view) {
   GtkWidget* root = gtk_widget_get_toplevel(native_view);
@@ -29,7 +29,9 @@
 
   WidgetGtk* widget = WidgetGtk::GetViewForNative(root);
   if (!widget) {
-    NOTREACHED();
+    // TODO(jcampan): http://crbug.com/21378 Reenable this NOTREACHED() when the
+    // options page is only based on views.
+    // NOTREACHED();
     return NULL;
   }
   FocusManager* focus_manager = widget->GetFocusManager();