Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: chrome/browser/ui/views/find_bar_view.cc

Issue 6675005: Integrate the new input method API for Views into Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows build. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/find_bar_view.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/find_bar_view.cc
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index db874cae3f96a7f135c7a2e3bb7c9003bb2437c0..c45c0bedcd3e2b79f8da1fbc7772a83ae79822fc 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -88,9 +88,6 @@ static const int kDefaultCharWidth = 43;
FindBarView::FindBarView(FindBarHost* host)
: DropdownBarView(host),
-#if defined(OS_LINUX)
- ignore_contents_changed_(false),
-#endif
find_text_(NULL),
match_count_text_(NULL),
focus_forwarder_view_(NULL),
@@ -179,13 +176,7 @@ FindBarView::~FindBarView() {
}
void FindBarView::SetFindText(const string16& find_text) {
-#if defined(OS_LINUX)
- ignore_contents_changed_ = true;
-#endif
find_text_->SetText(find_text);
-#if defined(OS_LINUX)
- ignore_contents_changed_ = false;
-#endif
}
string16 FindBarView::GetFindText() const {
@@ -469,12 +460,6 @@ void FindBarView::ButtonPressed(
void FindBarView::ContentsChanged(views::Textfield* sender,
const string16& new_contents) {
-#if defined(OS_LINUX)
- // On gtk setting the text in the find view causes a notification.
- if (ignore_contents_changed_)
- return;
-#endif
-
FindBarController* controller = find_bar_host()->GetFindBarController();
DCHECK(controller);
// We must guard against a NULL tab_contents, which can happen if the text
« no previous file with comments | « chrome/browser/ui/views/find_bar_view.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698