patches/patch-chrome_browser_ui_views_find__bar__view.cc

   1 $NetBSD$
   2
   3 --- chrome/browser/ui/views/find_bar_view.cc.orig       2011-04-13 08:01:42.000000000 +0000
   4 +++ chrome/browser/ui/views/find_bar_view.cc
   5 @@ -85,7 +85,7 @@ static const int kDefaultCharWidth = 43;
   6
   7  FindBarView::FindBarView(FindBarHost* host)
   8      : DropdownBarView(host),
   9 -#if defined(OS_LINUX)
  10 +#if defined(TOOLKIT_USES_GTK)
  11        ignore_contents_changed_(false),
  12  #endif
  13        find_text_(NULL),
  14 @@ -176,11 +176,11 @@ FindBarView::~FindBarView() {
  15  }
  16
  17  void FindBarView::SetFindText(const string16& find_text) {
  18 -#if defined(OS_LINUX)
  19 +#if defined(TOOLKIT_USES_GTK)
  20    ignore_contents_changed_ = true;
  21  #endif
  22    find_text_->SetText(find_text);
  23 -#if defined(OS_LINUX)
  24 +#if defined(TOOLKIT_USES_GTK)
  25    ignore_contents_changed_ = false;
  26  #endif
  27  }
  28 @@ -467,7 +467,7 @@ void FindBarView::ButtonPressed(
  29
  30  void FindBarView::ContentsChanged(views::Textfield* sender,
  31                                    const string16& new_contents) {
  32 -#if defined(OS_LINUX)
  33 +#if defined(TOOLKIT_USES_GTK)
  34    // On gtk setting the text in the find view causes a notification.
  35    if (ignore_contents_changed_)
  36      return;