chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm - Issue 6982011: Strip leading "javascript:" schemas from text pasted or dropped into the omnibox.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

Issue 6982011: Strip leading "javascript:" schemas from text pasted or dropped into the omnibox. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 7 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

« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm ('k') | chrome/browser/ui/omnibox/omnibox_view.h » ('j') | chrome/browser/ui/omnibox/omnibox_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (revision 85569)

+++ chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm (working copy)

@@ -9,7 +9,9 @@

#include "app/mac/nsimage_cache.h"

#include "base/mac/mac_util.h"

#include "base/memory/singleton.h"

+#include "base/string_util.h"

#include "base/sys_string_conversions.h"

+#include "base/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/autocomplete/autocomplete.h"

#include "chrome/browser/autocomplete/autocomplete_classifier.h"

@@ -757,6 +759,12 @@

GURL url(URLFixerUpper::FixupURL(

base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string()));

+ if (url.SchemeIs(chrome::kJavaScriptScheme)) {

+ string16 text(UTF8ToUTF16(url.spec()));

+ StripJavascriptSchema(text, &text);

+ browser_->window()->GetLocationBar()->location_entry()->SetUserText(text);

+ return;

+ }

browser_->GetSelectedTabContents()->OpenURL(url, GURL(), CURRENT_TAB,

PageTransition::TYPED);

}