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

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

Issue 149717: [Mac] Refactor location-bar autocomplete cell classes. (Closed)
Patch Set: jrg comment Created 11 years, 5 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/autocomplete/autocomplete_edit_view_mac.mm
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 2c541c885d5d73ecaeadd6835c30d61e9e051f51..98271c16e3fe891907900c4599359820147ed042 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -8,6 +8,7 @@
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/autocomplete/autocomplete_popup_model.h"
#include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
+#include "chrome/browser/cocoa/autocomplete_text_field.h"
#include "chrome/browser/tab_contents/tab_contents.h"
// Focus-handling between |field_| and |model_| is a bit subtle.
@@ -125,12 +126,16 @@ NSRange ComponentToNSRange(const url_parse::Component& component) {
- (void)windowDidResignKey:(NSNotification*)notification;
@end
+// TODO(shess): AutocompletePopupViewMac doesn't really need an
+// NSTextField. It wants to know where the position the popup, what
+// font to use, and it also needs to be able to attach the popup to
+// the window |field_| is in.
AutocompleteEditViewMac::AutocompleteEditViewMac(
AutocompleteEditController* controller,
ToolbarModel* toolbar_model,
Profile* profile,
CommandUpdater* command_updater,
- NSTextField* field)
+ AutocompleteTextField* field)
: model_(new AutocompleteEditModel(this, controller, profile)),
popup_view_(new AutocompletePopupViewMac(this, model_.get(), profile,
field)),
@@ -522,9 +527,9 @@ void AutocompleteEditViewMac::OnWillBeginEditing() {
// We should only arrive here when the field is focussed.
DCHECK([field_ currentEditor]);
- // TODO(shess): Having the control key depressed changes the desired
- // TLD for autocomplete, which changes the results. Not sure if we
- // can detect that without subclassing NSTextField.
+ // TODO(shess): Detect control-key situation. Since this code is
+ // called on first edit, not on receipt of focus, it may be that we
+ // cannot correctly handle this without refactoring.
const bool controlDown = false;
model_->OnSetFocus(controlDown);
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_mac.h ('k') | chrome/browser/cocoa/autocomplete_text_field.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698