summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 19:26:19 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 19:26:19 +0000
commit31b1bc3aee74415fc8333f537da2dde64f0e08f9 (patch)
tree754865e0f773e0fb4fc647ae61eb43a8a79d775c /chrome/browser/browser.cc
parentef47b8c0779d03237d4a20cb419ec4935deaa491 (diff)
downloadchromium_src-31b1bc3aee74415fc8333f537da2dde64f0e08f9.zip
chromium_src-31b1bc3aee74415fc8333f537da2dde64f0e08f9.tar.gz
chromium_src-31b1bc3aee74415fc8333f537da2dde64f0e08f9.tar.bz2
First cut at the find bar.
Ctrl+F will display a box (pushing down the web contents) that typing into will cause webkit to highlight on the page. Esc will dismiss the box. I also changed the gtk_widget_show_all in browser window to be a regular gtk_widget_show. Child widgets need to manually show themselves now. Review URL: http://codereview.chromium.org/42026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 43e4a49..dea7ae1 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -863,6 +863,7 @@ void Browser::Paste() {
UserMetrics::RecordAction(L"Paste", profile_);
ui_controls::SendKeyPress(L'V', true, false, false);
}
+#endif // #if defined(OS_WIN)
void Browser::Find() {
UserMetrics::RecordAction(L"Find", profile_);
@@ -878,7 +879,6 @@ void Browser::FindPrevious() {
UserMetrics::RecordAction(L"FindPrevious", profile_);
FindInPage(true, false);
}
-#endif // #if defined(OS_WIN)
void Browser::ZoomIn() {
UserMetrics::RecordAction(L"ZoomPlus", profile_);
@@ -1202,12 +1202,12 @@ void Browser::ExecuteCommand(int id) {
case IDC_COPY: Copy(); break;
case IDC_COPY_URL: CopyCurrentPageURL(); break;
case IDC_PASTE: Paste(); break;
+#endif
// Find-in-page
case IDC_FIND: Find(); break;
case IDC_FIND_NEXT: FindNext(); break;
case IDC_FIND_PREVIOUS: FindPrevious(); break;
-#endif
// Zoom
case IDC_ZOOM_PLUS: ZoomIn(); break;
@@ -2439,7 +2439,6 @@ GURL Browser::GetHomePage() {
return home_page;
}
-#if defined(OS_WIN)
void Browser::FindInPage(bool find_next, bool forward_direction) {
window_->ShowFindBar();
if (find_next) {
@@ -2448,7 +2447,6 @@ void Browser::FindInPage(bool find_next, bool forward_direction) {
forward_direction);
}
}
-#endif // OS_WIN
void Browser::CloseFrame() {
window_->Close();