diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
| commit | 2627431bef905332e55a90960aed8049b681689f (patch) | |
| tree | 4d15c42eb95a48241e2bc9a109bbb77c3eafad00 /views/focus | |
| parent | d328413b739ed1150369743a64cacfb167086a32 (diff) | |
| download | chromium_src-2627431bef905332e55a90960aed8049b681689f.zip chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.gz chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.bz2 | |
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
Diffstat (limited to 'views/focus')
| -rw-r--r-- | views/focus/focus_manager_gtk.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/views/focus/focus_manager_gtk.cc b/views/focus/focus_manager_gtk.cc index 6ba1390..5372bf4 100644 --- a/views/focus/focus_manager_gtk.cc +++ b/views/focus/focus_manager_gtk.cc @@ -20,7 +20,7 @@ void FocusManager::FocusNativeView(gfx::NativeView native_view) { 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 @@ FocusManager* FocusManager::GetFocusManagerForNativeView( 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(); |