diff options
7 files changed, 22 insertions, 17 deletions
diff --git a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc index 8c78c71..86e2e01 100644 --- a/chrome/browser/bookmarks/bookmark_node_data_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_node_data_unittest.cc @@ -58,7 +58,7 @@ TEST_F(BookmarkNodeDataTest, BogusRead) { // read it. TEST_F(BookmarkNodeDataTest, JustURL) { const GURL url("http://google.com"); - const string16 title(ASCIIToUTF16("title")); + const string16 title(ASCIIToUTF16("google.com")); ui::OSExchangeData data; data.SetURL(url, title); @@ -82,7 +82,7 @@ TEST_F(BookmarkNodeDataTest, URL) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(&profile); const BookmarkNode* root = model->bookmark_bar_node(); GURL url(GURL("http://foo.com")); - const string16 title(ASCIIToUTF16("blah")); + const string16 title(ASCIIToUTF16("foo.com")); const BookmarkNode* node = model->AddURL(root, 0, title, url); BookmarkNodeData drag_data(node); EXPECT_TRUE(drag_data.is_valid()); diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 86d7352..329654e 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -22,11 +22,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/user_metrics.h" -#include "grit/ui_strings.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/events/event.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/tree_node_iterator.h" using base::Time; @@ -276,14 +274,6 @@ bool CanPasteFromClipboard(const BookmarkNode* node) { return BookmarkNodeData::ClipboardContainsBookmarks(); } -string16 GetNameForURL(const GURL& url) { - if (url.is_valid()) { - return net::GetSuggestedFilename(url, "", "", "", "", std::string()); - } else { - return l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME); - } -} - // This is used with a tree iterator to skip subtrees which are not visible. static bool PruneInvisibleFolders(const BookmarkNode* node) { return !node->IsVisible(); diff --git a/chrome/browser/bookmarks/bookmark_utils.h b/chrome/browser/bookmarks/bookmark_utils.h index 7949adc..12631b6 100644 --- a/chrome/browser/bookmarks/bookmark_utils.h +++ b/chrome/browser/bookmarks/bookmark_utils.h @@ -96,10 +96,6 @@ void PasteFromClipboard(BookmarkModel* model, // Returns true if the user can copy from the pasteboard. bool CanPasteFromClipboard(const BookmarkNode* node); -// Returns a name for the given URL. Used for drags into bookmark areas when -// the source doesn't specify a title. -string16 GetNameForURL(const GURL& url); - // Returns a vector containing up to |max_count| of the most recently modified // folders. This never returns an empty vector. std::vector<const BookmarkNode*> GetMostRecentlyModifiedFolders( diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc index c4719a7..ebb3159 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc @@ -15,9 +15,12 @@ #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" +#include "grit/ui_strings.h" +#include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/gtk/gtk_screen_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas_skia_paint.h" @@ -456,4 +459,12 @@ bool CreateNewBookmarkFromNetscapeURL(GtkSelectionData* selection_data, return true; } +string16 GetNameForURL(const GURL& url) { + if (url.is_valid()) { + return net::GetSuggestedFilename(url, "", "", "", "", std::string()); + } else { + return l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME); + } +} + } // namespace bookmark_utils diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h index 133293a..58ff96e 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h @@ -14,6 +14,7 @@ class BookmarkModel; class BookmarkNode; class GtkThemeService; +class GURL; class Profile; typedef struct _GdkDragContext GdkDragContext; @@ -107,6 +108,10 @@ bool CreateNewBookmarkFromNetscapeURL( const BookmarkNode* parent, int idx); +// Returns a name for the given URL. Used for drags into bookmark areas when +// the source doesn't specify a title. +string16 GetNameForURL(const GURL& url); + } // namespace bookmark_utils #endif // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_UTILS_GTK_H_ diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index 5601121..b921ec8 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -388,7 +388,10 @@ bool OSExchangeDataProviderWin::GetURLAndTitle(GURL* url, GURL test_url(url_str); if (test_url.is_valid()) { *url = test_url; + *title = net::GetSuggestedFilename(*url, "", "", "", "", std::string()); return true; + } else { + *title = l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME); } } else if (GetPlainTextURL(source_object_, url)) { title->clear(); diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc index 909b890..c5b0ed5 100644 --- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc +++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc @@ -296,7 +296,7 @@ TEST(OSExchangeDataTest, TestURLExchangeFormats) { OSExchangeData data; std::string url_spec = "http://www.google.com/"; GURL url(url_spec); - std::wstring url_title = L"Google"; + std::wstring url_title = L"www.google.com"; data.SetURL(url, url_title); std::wstring output; |