summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r--chrome/browser/gtk/bookmark_editor_gtk.cc5
-rw-r--r--chrome/browser/gtk/options/general_page_gtk.cc5
-rw-r--r--chrome/browser/gtk/options/url_picker_dialog_gtk.cc8
3 files changed, 7 insertions, 11 deletions
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index d2de0ae..318ba91 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -278,9 +278,8 @@ void BookmarkEditorGtk::Reset() {
GURL BookmarkEditorGtk::GetInputURL() const {
if (!url_entry_)
return GURL(); // Happens when we're editing a folder.
-
- return GURL(URLFixerUpper::FixupURL(
- gtk_entry_get_text(GTK_ENTRY(url_entry_)), ""));
+ return URLFixerUpper::FixupURL(gtk_entry_get_text(GTK_ENTRY(url_entry_)),
+ std::string());
}
std::wstring BookmarkEditorGtk::GetInputTitle() const {
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index d36fbac..0df5b20 100644
--- a/chrome/browser/gtk/options/general_page_gtk.cc
+++ b/chrome/browser/gtk/options/general_page_gtk.cc
@@ -650,9 +650,8 @@ void GeneralPageGtk::SetHomepage(const GURL& homepage) {
}
void GeneralPageGtk::SetHomepageFromEntry() {
- GURL url(URLFixerUpper::FixupURL(
- gtk_entry_get_text(GTK_ENTRY(homepage_use_url_entry_)), ""));
- SetHomepage(url);
+ SetHomepage(URLFixerUpper::FixupURL(
+ gtk_entry_get_text(GTK_ENTRY(homepage_use_url_entry_)), std::string()));
}
void GeneralPageGtk::EnableCustomHomepagesControls(bool enable) {
diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
index dd51798..515eb47 100644
--- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
+++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
@@ -180,9 +180,8 @@ UrlPickerDialogGtk::~UrlPickerDialogGtk() {
}
void UrlPickerDialogGtk::AddURL() {
- GURL url(URLFixerUpper::FixupURL(
- gtk_entry_get_text(GTK_ENTRY(url_entry_)), ""));
- callback_->Run(url);
+ callback_->Run(URLFixerUpper::FixupURL(
+ gtk_entry_get_text(GTK_ENTRY(url_entry_)), std::string()));
}
void UrlPickerDialogGtk::EnableControls() {
@@ -263,8 +262,7 @@ void UrlPickerDialogGtk::OnHistorySelectionChanged(
void UrlPickerDialogGtk::OnHistoryRowActivated(GtkWidget* tree_view,
GtkTreePath* path,
GtkTreeViewColumn* column) {
- GURL url(URLFixerUpper::FixupURL(GetURLForPath(path), ""));
- callback_->Run(url);
+ callback_->Run(URLFixerUpper::FixupURL(GetURLForPath(path), std::string()));
gtk_widget_destroy(dialog_);
}