summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 19:40:33 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 19:40:33 +0000
commitfb5153c5dd44a771be0cbd030a02eccf5cde76ed (patch)
treef1533b6d48fc5d4bc88729cb4a7fa885ca6e7d1a /chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
parent7df4348513bd316224dbc1399990a2538c55a5bc (diff)
downloadchromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.zip
chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.gz
chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.bz2
Make TOOLKIT_VIEWS port use views-based Autocomplete popup.
The popups now interact with the edit via AutocompleteEditView rather than the platform-specific types. Note this also removes the old omnibox popup code. It hasn't been active for some time. BUG=none TEST=none Review URL: http://codereview.chromium.org/160378 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_mac.mm')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index d1f8f31..84f6d0d 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -161,7 +161,7 @@ AutocompleteEditViewMac::AutocompleteEditViewMac(
// |model_|.
NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
[nc addObserver:edit_helper_
- selector:@selector(windowDidResignKey:)
+ selector:@selector(windowDidResignKey:)
name:NSWindowDidResignKeyNotification
object:[field_ window]];
}
@@ -216,7 +216,7 @@ void AutocompleteEditViewMac::Update(
if (tab_for_state_restoring) {
RevertAll();
- const AutocompleteEditViewMacState* state =
+ const AutocompleteEditViewMacState* state =
GetStateFromTab(tab_for_state_restoring);
if (state) {
// Should restore the user's text via SetUserText().
@@ -511,6 +511,10 @@ bool AutocompleteEditViewMac::OnAfterPossibleChange() {
return something_changed;
}
+gfx::NativeView AutocompleteEditViewMac::GetNativeView() const {
+ return field_;
+}
+
void AutocompleteEditViewMac::OnUpOrDownKeyPressed(bool up, bool by_page) {
// We should only arrive here when the field is focussed.
DCHECK(IsFirstResponder());
@@ -661,12 +665,12 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
return YES;
}
}
-
+
if (cmd == @selector(scrollPageDown:)) {
edit_view_->OnUpOrDownKeyPressed(false, true);
return YES;
}
-
+
if (cmd == @selector(scrollPageUp:)) {
edit_view_->OnUpOrDownKeyPressed(true, true);
return YES;