diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
4 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index ec02dac..079e509 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -11,7 +11,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_utils.h" #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "components/user_prefs/user_prefs.h" using bookmarks::BookmarkExpandedStateTracker; @@ -104,7 +104,7 @@ using bookmarks::BookmarkNode; // If possible, return a valid GURL from the URL text field. - (GURL)GURLFromUrlField { NSString* url = [self displayURL]; - return url_formatter::FixupURL([url UTF8String], std::string()); + return url_fixer::FixupURL([url UTF8String], std::string()); } // Enable the OK button if there is a valid URL. diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm index dfa18af..d7418d9 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm @@ -17,8 +17,8 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #import "chrome/browser/ui/cocoa/bubble_view.h" -#include "components/url_formatter/elide_url.h" -#include "components/url_formatter/url_formatter.h" +#include "components/secure_display/elide_url.h" +#include "net/base/net_util.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" @@ -235,9 +235,9 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) { gfx::FontList font_list_chr( gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font))); - base::string16 original_url_text = url_formatter::FormatUrl(url, languages); + base::string16 original_url_text = net::FormatUrl(url, languages); base::string16 status = - url_formatter::ElideUrl(url, font_list_chr, text_width, languages); + secure_display::ElideUrl(url, font_list_chr, text_width, languages); SetText(status, true); @@ -706,7 +706,7 @@ void StatusBubbleMac::ExpandBubble() { NSFont* font = [[window_ contentView] font]; gfx::FontList font_list_chr( gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font))); - base::string16 expanded_url = url_formatter::ElideUrl( + base::string16 expanded_url = secure_display::ElideUrl( url_, font_list_chr, max_bubble_width, languages_); // Scale width from gfx::Font in view coordinates to window coordinates. diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 8771039..ded9e13 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -51,7 +51,7 @@ #include "components/metrics/proto/omnibox_event.pb.h" #include "components/omnibox/browser/autocomplete_classifier.h" #include "components/omnibox/browser/autocomplete_match.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/user_metrics.h" @@ -2093,7 +2093,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { NOTIMPLEMENTED(); // Get the first URL and fix it up. - GURL url(GURL(url_formatter::FixupURL( + GURL url(GURL(url_fixer::FixupURL( base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string()))); [self openURL:&url inView:view at:point]; diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index a5d5572..2566d31 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -53,7 +53,7 @@ #include "components/omnibox/browser/autocomplete_classifier.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/search_engines/template_url_service.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" #import "ui/base/cocoa/menu_controller.h" @@ -895,8 +895,8 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate { NOTIMPLEMENTED(); // Get the first URL and fix it up. - GURL url(url_formatter::FixupURL( - base::SysNSStringToUTF8([urls objectAtIndex:0]), std::string())); + GURL url(url_fixer::FixupURL(base::SysNSStringToUTF8([urls objectAtIndex:0]), + std::string())); if (url.SchemeIs(url::kJavaScriptScheme)) { browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText( |