summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-20 06:29:16 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-20 06:29:16 +0000
commit52d2d0c3f6643db7e9b8a3355be65f457d3dc947 (patch)
treebc8e6791c4623c16f37d2f8d9c1c2baecee4de4b /chrome
parent346b4976542798bac5f42b373f2ca015e165a172 (diff)
downloadchromium_src-52d2d0c3f6643db7e9b8a3355be65f457d3dc947.zip
chromium_src-52d2d0c3f6643db7e9b8a3355be65f457d3dc947.tar.gz
chromium_src-52d2d0c3f6643db7e9b8a3355be65f457d3dc947.tar.bz2
Mac: Third half of CL 481012 (reverted at r35038). Will it blend?
This is an experiment. I expect the startup times to regress and Mac Perf(2) to turn red, at which point I'll revert this. If not, the TEST below applies. BUG=24631 TEST=Select a URL/link/file from somewhere (a link in a browser, a URL in text, a file from the desktop, etc.) and drag it to the Omnibox in a Chromium browser window; the contents of the Omnibox should be selected to indicate that a drop would replace its contents; dropping should navigate to the appropriate location. TBR=shess@chromium.org Review URL: http://codereview.chromium.org/500155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/cocoa/autocomplete_text_field.mm5
-rw-r--r--chrome/browser/cocoa/autocomplete_text_field_editor.mm5
2 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/autocomplete_text_field.mm b/chrome/browser/cocoa/autocomplete_text_field.mm
index cea5f15..c465ef1 100644
--- a/chrome/browser/cocoa/autocomplete_text_field.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field.mm
@@ -265,11 +265,6 @@
// (URLDropTarget protocol)
- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
- // Make ourself the first responder, which will select the text to indicate
- // that our contents would be replaced by a drop.
- // TODO(viettrungluu): crbug.com/30809 -- this is a hack since it steals focus
- // and doesn't return it.
- [[self window] makeFirstResponder:self];
return [dropHandler_ draggingEntered:sender];
}
diff --git a/chrome/browser/cocoa/autocomplete_text_field_editor.mm b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
index ceaacd4..e7d0a1b 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_editor.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
@@ -77,14 +77,9 @@
- (void)updateRuler {
}
-#if 0
-// TODO(viettrungluu): This is causing a regression somehow. So let's disable it
-// and work from there. See also corresponding comment in
-// autocomplete_text_field.mm.
// Let the |AutocompleteTextField| handle drops.
- (void)updateDragTypeRegistration {
}
-#endif
- (NSMenu*)menuForEvent:(NSEvent*)event {
NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"TITLE"] autorelease];