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

Unified Diff: chrome/browser/gtk/options/general_page_gtk.cc

Issue 141026: Add a (non functional) gtk KeywordEditorWindow and hook it up in the relevant places. (Closed)
Patch Set: comment typo Created 11 years, 6 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
« no previous file with comments | « chrome/browser/gtk/options/general_page_gtk.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/options/general_page_gtk.cc
diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc
index 395adcab5abc4233e6462d63fdfde894544c268c..589f8ea5e587bbc9b675668c08382dda42cb8b46 100644
--- a/chrome/browser/gtk/options/general_page_gtk.cc
+++ b/chrome/browser/gtk/options/general_page_gtk.cc
@@ -10,6 +10,7 @@
#include "base/gfx/png_decoder.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/gtk/keyword_editor_view.h"
#include "chrome/browser/gtk/options/options_layout_gtk.h"
#include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
#include "chrome/browser/net/url_fixer_upper.h"
@@ -325,10 +326,11 @@ GtkWidget* GeneralPageGtk::InitDefaultSearchGroup() {
}
OnTemplateURLModelChanged();
- // TODO(mattm): hook this up
default_search_manage_engines_button_ = gtk_button_new_with_label(
l10n_util::GetStringUTF8(
IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES_LINK).c_str());
+ g_signal_connect(G_OBJECT(default_search_manage_engines_button_), "clicked",
+ G_CALLBACK(OnDefaultSearchManageEnginesClicked), this);
gtk_box_pack_end(GTK_BOX(hbox), default_search_manage_engines_button_,
FALSE, FALSE, 0);
@@ -468,6 +470,12 @@ void GeneralPageGtk::OnDefaultSearchEngineChanged(
}
// static
+void GeneralPageGtk::OnDefaultSearchManageEnginesClicked(
+ GtkButton* button, GeneralPageGtk* general_page) {
+ KeywordEditorView::Show(general_page->profile());
+}
+
+// static
void GeneralPageGtk::OnBrowserUseAsDefaultClicked(
GtkButton* button,
GeneralPageGtk* general_page) {
« no previous file with comments | « chrome/browser/gtk/options/general_page_gtk.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698