diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 21:36:35 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 21:36:35 +0000 |
| commit | 35157685385262c6b2b6fe412fc4953a1528875e (patch) | |
| tree | 6608c0cb9d1ed42de36f97114005ce883c1c2f28 | |
| parent | 318e180241621d1d30b02e86abf085dfe5cfa106 (diff) | |
| download | chromium_src-35157685385262c6b2b6fe412fc4953a1528875e.zip chromium_src-35157685385262c6b2b6fe412fc4953a1528875e.tar.gz chromium_src-35157685385262c6b2b6fe412fc4953a1528875e.tar.bz2 | |
Merge 116692 - Change omnibox behavior when stripping javascript schema to navigate after stripping the schema on drag drop.
BUG=109245
TEST=N/A
Review URL: http://codereview.chromium.org/9116016
TBR=cdn@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9285029
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@118905 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/views/omnibox/omnibox_view_win.cc | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index a5f5f68..33402e6 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -753,7 +753,6 @@ class NotificationBridge : public content::NotificationObserver { if (url.SchemeIs(chrome::kJavaScriptScheme)) { browser_->window()->GetLocationBar()->location_entry()->SetUserText( OmniboxView::StripJavascriptSchemas(UTF8ToUTF16(url.spec()))); - return; } browser_->GetSelectedTabContents()->OpenURL(url, GURL(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED); diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index 30a1ea4..f5fe8b1 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -999,8 +999,7 @@ int OmniboxViewWin::OnPerformDropImpl(const views::DropTargetEvent& event, if (data.GetURLAndTitle(&url, &title)) { string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec()))); SetUserText(text); - if (url.spec().length() == text.length()) - model()->AcceptInput(CURRENT_TAB, true); + model()->AcceptInput(CURRENT_TAB, true); return CopyOrLinkDragOperation(event.source_operations()); } } else if (data.HasString()) { |