diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:08:19 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 19:08:19 +0000 |
| commit | 9de6459478d57b435a31be7b964f9248d4ec17e3 (patch) | |
| tree | bdcd3115b31cbea5ade38bf6d55d65d0a25046a3 /views/controls/native | |
| parent | afae49add8fb4b28405a9cd8f6321eb51f69b037 (diff) | |
| download | chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.zip chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.tar.gz chromium_src-9de6459478d57b435a31be7b964f9248d4ec17e3.tar.bz2 | |
Land http://codereview.chromium.org/206025 for Charlie:
Fix settings page transparent background issue
Also comment out focus manager check due to bug: http://crbug.com/21378
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/194128
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native')
| -rw-r--r-- | views/controls/native/native_view_host_gtk.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc index 306aa94..ea9bd62 100644 --- a/views/controls/native/native_view_host_gtk.cc +++ b/views/controls/native/native_view_host_gtk.cc @@ -5,6 +5,7 @@ #include "views/controls/native/native_view_host_gtk.h" #include <gtk/gtk.h> +#include <algorithm> #include "base/logging.h" #include "views/controls/native/native_view_host.h" @@ -48,8 +49,8 @@ void NativeViewHostGtk::NativeViewAttached() { if (!focus_signal_id_) { focus_signal_id_ = g_signal_connect(G_OBJECT(host_->native_view()), - "focus-in-event", - G_CALLBACK(CallFocusIn), this); + "focus-in-event", + G_CALLBACK(CallFocusIn), this); } // Always layout though. @@ -215,12 +216,15 @@ void NativeViewHostGtk::CallDestroy(GtkObject* object, // static void NativeViewHostGtk::CallFocusIn(GtkWidget* widget, - GdkEventFocus* event, + GdkEventFocus* event, NativeViewHostGtk* host) { 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(); + NOTIMPLEMENTED(); return; } focus_manager->SetFocusedView(host->host_->focus_view()); |