From 2627431bef905332e55a90960aed8049b681689f Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Tue, 15 Sep 2009 20:21:53 +0000 Subject: Lands http://codereview.chromium.org/193032 for Charlie: First pass at adding ChromeOS settings - a mock wifi selector combobox - touchpad settings that makes calls to synclient - on startup, touchpad settings are initialized to what's stored in preferences TEST=none BUG=none Review URL: http://codereview.chromium.org/203073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/native_control_gtk.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'views/controls') diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc index 8de383f..d69ae758 100644 --- a/views/controls/native_control_gtk.cc +++ b/views/controls/native_control_gtk.cc @@ -76,7 +76,9 @@ void NativeControlGtk::CallFocusIn(GtkWidget* widget, 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()); -- cgit v1.1