Don't allow drops on the omnibox for popup windows.

BUG=33071
TEST=drags to omnibox in popup should be denied. drags to omnibox in normal window should be allowed and load the url.
Review URL: http://codereview.chromium.org/1225007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42753 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/autocomplete_text_field.mm b/chrome/browser/cocoa/autocomplete_text_field.mm
index d20651b9..de04957 100644
--- a/chrome/browser/cocoa/autocomplete_text_field.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field.mm
@@ -25,7 +25,6 @@
 
 - (void)awakeFromNib {
   DCHECK([[self cell] isKindOfClass:[AutocompleteTextFieldCell class]]);
-  dropHandler_.reset([[URLDropTargetHandler alloc] initWithView:self]);
   currentToolTips_.reset([[NSMutableArray alloc] init]);
 }
 
@@ -304,6 +303,12 @@
            selector:@selector(windowDidResignKey:)
                name:NSWindowDidResignKeyNotification
              object:[self window]];
+    // Only register for drops if not in a popup window. Lazily create the
+    // drop handler when the type of window is known.
+    BrowserWindowController* windowController =
+        [BrowserWindowController browserWindowControllerForView:self];
+    if ([windowController isNormalWindow])
+      dropHandler_.reset([[URLDropTargetHandler alloc] initWithView:self]);
   }
 }
 
@@ -329,8 +334,8 @@
 
 // (URLDropTarget protocol)
 - (id<URLDropTargetController>)urlDropController {
-  BrowserWindowController* windowController = [[self window] windowController];
-  DCHECK([windowController isKindOfClass:[BrowserWindowController class]]);
+  BrowserWindowController* windowController =
+      [BrowserWindowController browserWindowControllerForView:self];
   return [windowController toolbarController];
 }
 
diff --git a/chrome/browser/cocoa/autocomplete_text_field_editor.mm b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
index 2a5a95e..a4d5aec 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_editor.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_editor.mm
@@ -189,8 +189,8 @@ class Extension;
 
 // (URLDropTarget protocol)
 - (id<URLDropTargetController>)urlDropController {
-  BrowserWindowController* windowController = [[self window] windowController];
-  DCHECK([windowController isKindOfClass:[BrowserWindowController class]]);
+  BrowserWindowController* windowController =
+      [BrowserWindowController browserWindowControllerForView:self];
   return [windowController toolbarController];
 }