summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-19 23:41:07 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-19 23:41:07 +0000
commitaec3525822420bd1386af1a3cfd9fe3f6d0dbe90 (patch)
tree5857dc8b46c48873b42167cf2e50db63cc69528b
parent284c373d43107741d1bad8c118b8e88774d533be (diff)
downloadchromium_src-aec3525822420bd1386af1a3cfd9fe3f6d0dbe90.zip
chromium_src-aec3525822420bd1386af1a3cfd9fe3f6d0dbe90.tar.gz
chromium_src-aec3525822420bd1386af1a3cfd9fe3f6d0dbe90.tar.bz2
Mac: Fix the Go button.
Go eventually calls LocationBarViewMac::AcceptInputWithDisposition(), which was NOTIMPLEMENTED(). Implement. http://crbug.com/12253 TEST=Type some text into omnibox. Click the Go button rather than hitting enter. Review URL: http://codereview.chromium.org/113595 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16436 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/location_bar_view_mac.h5
-rw-r--r--chrome/browser/cocoa/location_bar_view_mac.mm9
2 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar_view_mac.h
index 12f32fa..52b2a17 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.h
+++ b/chrome/browser/cocoa/location_bar_view_mac.h
@@ -33,9 +33,8 @@ class LocationBarViewMac : public AutocompleteEditController,
virtual std::wstring GetInputString() const;
virtual WindowOpenDisposition GetWindowOpenDisposition() const;
virtual PageTransition::Type GetPageTransition() const;
- virtual void AcceptInput() { NOTIMPLEMENTED(); }
- virtual void AcceptInputWithDisposition(WindowOpenDisposition disposition)
- { NOTIMPLEMENTED(); }
+ virtual void AcceptInput();
+ virtual void AcceptInputWithDisposition(WindowOpenDisposition disposition);
virtual void FocusLocation();
virtual void FocusSearch() { NOTIMPLEMENTED(); }
virtual void UpdateFeedIcon() { /* http://crbug.com/8832 */ }
diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm
index 7da3091..e7651a0 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar_view_mac.mm
@@ -47,6 +47,15 @@ PageTransition::Type LocationBarViewMac::GetPageTransition() const {
return transition_;
}
+void LocationBarViewMac::AcceptInput() {
+ AcceptInputWithDisposition(CURRENT_TAB);
+}
+
+void LocationBarViewMac::AcceptInputWithDisposition(
+ WindowOpenDisposition disposition) {
+ edit_view_->AcceptInput(disposition, false);
+}
+
void LocationBarViewMac::FocusLocation() {
edit_view_->FocusLocation();
}