Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2475)

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc

Issue 7310023: Pre-fill the 'Add Page' bookmark window with the current page (gtk and windows). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 5 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
Index: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
index 9e0b4e75a8d0ab683e26e10ec60557cb3f346d9d..0ccd43dbfea6df1ed3b0be29809d67e920ddf0a4 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -276,10 +276,17 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
name_entry_ = gtk_entry_new();
std::string title;
+ GURL url;
if (details_.type == EditDetails::EXISTING_NODE) {
title = UTF16ToUTF8(details_.existing_node->GetTitle());
+ url = details_.existing_node->GetURL();
} else if (details_.type == EditDetails::NEW_FOLDER) {
title = l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME);
+ } else if (details_.type == EditDetails::NEW_URL) {
+ string16 title16;
+ bookmark_utils::GetURLAndTitleToBookmarkFromCurrentTab(profile_,
+ &url, &title16);
+ title = UTF16ToUTF8(title16);
}
gtk_entry_set_text(GTK_ENTRY(name_entry_), title.c_str());
g_signal_connect(name_entry_, "changed",
@@ -289,10 +296,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
GtkWidget* table;
if (details_.type != EditDetails::NEW_FOLDER) {
url_entry_ = gtk_entry_new();
- std::string url_spec;
- if (details_.type == EditDetails::EXISTING_NODE)
- url_spec = details_.existing_node->GetURL().spec();
- gtk_entry_set_text(GTK_ENTRY(url_entry_), url_spec.c_str());
+ gtk_entry_set_text(GTK_ENTRY(url_entry_), url.spec().c_str());
g_signal_connect(url_entry_, "changed",
G_CALLBACK(OnEntryChangedThunk), this);
gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE);
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698