summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 16:14:19 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-02 16:14:19 +0000
commit2ca5a8942401d20b7626dbee2a615a49cae0c6ab (patch)
tree220aa7601ee498532a4397094fdbeba52acaa5fd
parentf3ccbc863dac3b0d4ddfc3fc811c808fed5143ee (diff)
downloadchromium_src-2ca5a8942401d20b7626dbee2a615a49cae0c6ab.zip
chromium_src-2ca5a8942401d20b7626dbee2a615a49cae0c6ab.tar.gz
chromium_src-2ca5a8942401d20b7626dbee2a615a49cae0c6ab.tar.bz2
gtk: Call the non-deprecated version of OpenURL() which receives OpenURLParams.
BUG=None TEST=None R=tony@chromium.org Review URL: http://codereview.chromium.org/7830018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99380 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/gtk/about_chrome_dialog.cc4
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc4
-rw-r--r--chrome/browser/ui/gtk/global_bookmark_menu.cc4
-rw-r--r--chrome/browser/ui/gtk/global_history_menu.cc4
-rw-r--r--chrome/browser/ui/gtk/location_bar_view_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/page_info_bubble_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/sad_tab_gtk.cc3
-rw-r--r--chrome/browser/ui/gtk/view_id_util_browsertest.cc4
9 files changed, 18 insertions, 15 deletions
diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc
index 164ea80..1c036ac 100644
--- a/chrome/browser/ui/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc
@@ -68,8 +68,8 @@ GtkWidget* MakeMarkupLabel(const char* format, const std::string& str) {
}
void OnLinkButtonClick(GtkWidget* button, const char* url) {
- BrowserList::GetLastActive()->
- OpenURL(GURL(url), GURL(), NEW_WINDOW, PageTransition::LINK);
+ BrowserList::GetLastActive()->OpenURL(OpenURLParams(
+ GURL(url), GURL(), NEW_WINDOW, PageTransition::LINK));
}
const char* GetChromiumUrl() {
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index 94de289..198be4a 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -135,8 +135,8 @@ void BookmarkMenuController::NavigateToMenuItem(
const BookmarkNode* node = GetNodeFromMenuItem(menu_item);
DCHECK(node);
DCHECK(page_navigator_);
- page_navigator_->OpenURL(
- node->url(), GURL(), disposition, PageTransition::AUTO_BOOKMARK);
+ page_navigator_->OpenURL(OpenURLParams(
+ node->url(), GURL(), disposition, PageTransition::AUTO_BOOKMARK));
}
void BookmarkMenuController::BuildMenu(const BookmarkNode* parent,
diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
index c553231..8544cda 100644
--- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc
@@ -261,8 +261,8 @@ void ExtensionInstallDialog::OnResponse(GtkWidget* dialog, int response_id) {
void ExtensionInstallDialog::OnStoreLinkClick(GtkWidget* sender) {
GURL store_url(
extension_urls::GetWebstoreItemDetailURLPrefix() + extension_->id());
- BrowserList::GetLastActive()->
- OpenURL(store_url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ BrowserList::GetLastActive()->OpenURL(OpenURLParams(
+ store_url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK));
OnResponse(dialog_, GTK_RESPONSE_CLOSE);
}
diff --git a/chrome/browser/ui/gtk/global_bookmark_menu.cc b/chrome/browser/ui/gtk/global_bookmark_menu.cc
index 801cf60..04d36ef 100644
--- a/chrome/browser/ui/gtk/global_bookmark_menu.cc
+++ b/chrome/browser/ui/gtk/global_bookmark_menu.cc
@@ -261,7 +261,7 @@ void GlobalBookmarkMenu::OnBookmarkItemActivated(GtkWidget* menu_item) {
const BookmarkNode* node = static_cast<const BookmarkNode*>(
g_object_get_data(G_OBJECT(menu_item), "bookmark-node"));
- browser_->OpenURL(node->url(), GURL(), NEW_FOREGROUND_TAB,
- PageTransition::AUTO_BOOKMARK);
+ browser_->OpenURL(OpenURLParams(node->url(), GURL(), NEW_FOREGROUND_TAB,
+ PageTransition::AUTO_BOOKMARK));
}
diff --git a/chrome/browser/ui/gtk/global_history_menu.cc b/chrome/browser/ui/gtk/global_history_menu.cc
index e5271c5..83f0883 100644
--- a/chrome/browser/ui/gtk/global_history_menu.cc
+++ b/chrome/browser/ui/gtk/global_history_menu.cc
@@ -422,8 +422,8 @@ void GlobalHistoryMenu::OnRecentlyClosedItemActivated(GtkWidget* sender) {
item->session_id, false);
} else {
DCHECK(item->url.is_valid());
- browser_->OpenURL(item->url, GURL(), disposition,
- PageTransition::AUTO_BOOKMARK);
+ browser_->OpenURL(OpenURLParams(item->url, GURL(), disposition,
+ PageTransition::AUTO_BOOKMARK));
}
}
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index ef8cf44..1775503 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -1049,7 +1049,8 @@ gboolean LocationBarViewGtk::OnIconReleased(GtkWidget* sender,
if (!gtk_util::URLFromPrimarySelection(browser_->profile(), &url))
return FALSE;
- tab->OpenURL(url, GURL(), CURRENT_TAB, PageTransition::TYPED);
+ tab->OpenURL(OpenURLParams(
+ url, GURL(), CURRENT_TAB, PageTransition::TYPED));
return TRUE;
}
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index 4462e28..bc4cda7 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -229,7 +229,8 @@ void PageInfoBubbleGtk::OnHelpLinkClicked(GtkWidget* widget) {
GURL url = google_util::AppendGoogleLocaleParam(
GURL(chrome::kPageInfoHelpCenterURL));
Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
- browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
+ browser->OpenURL(OpenURLParams(
+ url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK));
bubble_->Close();
}
diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc
index d818729..2fc2081 100644
--- a/chrome/browser/ui/gtk/sad_tab_gtk.cc
+++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc
@@ -134,6 +134,7 @@ void SadTabGtk::OnLinkButtonClick(GtkWidget* sender) {
kind_ == CRASHED ?
chrome::kCrashReasonURL :
chrome::kKillReasonURL));
- tab_contents_->OpenURL(help_url, GURL(), CURRENT_TAB, PageTransition::LINK);
+ tab_contents_->OpenURL(OpenURLParams(
+ help_url, GURL(), CURRENT_TAB, PageTransition::LINK));
}
}
diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
index 838bf1a..1847867 100644
--- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc
+++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
@@ -58,8 +58,8 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
CheckViewID(VIEW_ID_TAB_0, true);
CheckViewID(VIEW_ID_TAB_1, false);
- browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(),
- NEW_BACKGROUND_TAB, PageTransition::TYPED);
+ browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL), GURL(),
+ NEW_BACKGROUND_TAB, PageTransition::TYPED));
CheckViewID(VIEW_ID_TAB_0, true);
CheckViewID(VIEW_ID_TAB_1, true);