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

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

Issue 200035: First cut at implementation of FindBar for views / gtk... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
Index: chrome/browser/views/find_bar_view.cc
===================================================================
--- chrome/browser/views/find_bar_view.cc (revision 25765)
+++ chrome/browser/views/find_bar_view.cc (working copy)
@@ -13,7 +13,7 @@
#include "chrome/browser/browser_theme_provider.h"
#include "chrome/browser/find_bar_controller.h"
#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/find_bar_win.h"
+#include "chrome/browser/views/find_bar_host.h"
#include "chrome/browser/view_ids.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
@@ -76,7 +76,7 @@
////////////////////////////////////////////////////////////////////////////////
// FindBarView, public:
-FindBarView::FindBarView(FindBarWin* container)
+FindBarView::FindBarView(FindBarHost* container)
: container_(container),
find_text_(NULL),
match_count_text_(NULL),
@@ -467,24 +467,20 @@
if (!container_->IsVisible())
return false;
- // TODO(port): Handle this for other platforms.
- #if defined(OS_WIN)
- if (container_->MaybeForwardKeystrokeToWebpage(key.message, key.key,
- key.flags))
+ if (container_->MaybeForwardKeystrokeToWebpage(key))
return true; // Handled, we are done!
- if (views::Textfield::IsKeystrokeEnter(key)) {
+ if (key.GetKeyboardCode() == base::VKEY_RETURN) {
// Pressing Return/Enter starts the search (unless text box is empty).
- std::wstring find_string = find_text_->text();
+ string16 find_string = find_text_->text();
if (!find_string.empty()) {
// Search forwards for enter, backwards for shift-enter.
container_->GetFindBarController()->tab_contents()->StartFinding(
find_string,
- GetKeyState(VK_SHIFT) >= 0,
+ key.IsShiftHeld(),
false); // Not case sensitive.
}
}
- #endif
return false;
}

Powered by Google App Engine
This is Rietveld 408576698