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,11 @@ |
GURL url(URLFixerUpper::FixupURL( |
base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string())); |
+ if (url.SchemeIs(chrome::kJavaScriptScheme)) { |
+ string16 text(views::StripJavascriptSchemas(UTF8ToUTF16(url.spec()))); |
Peter Kasting
2011/05/24 00:15:18
Nit: Just inline this into the next statement
Cris Neckar
2011/05/24 17:09:40
Done.
|
+ browser_->window()->GetLocationBar()->location_entry()->SetUserText(text); |
+ return; |
+ } |
browser_->GetSelectedTabContents()->OpenURL(url, GURL(), CURRENT_TAB, |
PageTransition::TYPED); |
} |