diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/gtk/options/general_page_gtk.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/gtk/options/general_page_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/options/general_page_gtk.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h index 143f447..0050b2b 100644 --- a/chrome/browser/gtk/options/general_page_gtk.h +++ b/chrome/browser/gtk/options/general_page_gtk.h @@ -36,6 +36,8 @@ class GeneralPageGtk : public OptionsPageBase, GtkWidget* get_page_widget() const { return page_; } private: + GtkWindow* GetWindow(); + // Overridden from OptionsPageBase virtual void NotifyPrefChanged(const std::string* pref_name); virtual void HighlightGroup(OptionsGroup highlight_group); @@ -92,7 +94,11 @@ class GeneralPageGtk : public OptionsPageBase, CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnDefaultSearchEngineChanged); CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnDefaultSearchManageEnginesClicked); + CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnInstantToggled); CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnBrowserUseAsDefaultClicked); + CHROMEGTK_CALLBACK_1(GeneralPageGtk, void, OnInstantLabelSizeAllocate, + GtkAllocation*); + CHROMEGTK_CALLBACK_0(GeneralPageGtk, void, OnSearchLearnMoreClicked); CHROMEG_CALLBACK_0(GeneralPageGtk, void, OnStartupPagesSelectionChanged, GtkTreeSelection*); @@ -137,6 +143,10 @@ class GeneralPageGtk : public OptionsPageBase, GtkListStore* default_search_engines_model_; GtkWidget* default_search_manage_engines_button_; TemplateURLModel* template_url_model_; + GtkWidget* instant_checkbox_; + // This widget acts as the indent for the instant warning label. + GtkWidget* instant_indent_; + BooleanPrefMember instant_; // Widgets of the default browser group GtkWidget* default_browser_status_label_; |