diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 15:49:57 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 15:49:57 +0000 |
commit | 0519e110045415c8d674a8a5d0cdd587b9ce8e1f (patch) | |
tree | 694e989b739f39c086dbc62bdf276d9c92f10aa7 /chrome/browser/views | |
parent | eae033a397da42c049575245c276a6eb6f5be93e (diff) | |
download | chromium_src-0519e110045415c8d674a8a5d0cdd587b9ce8e1f.zip chromium_src-0519e110045415c8d674a8a5d0cdd587b9ce8e1f.tar.gz chromium_src-0519e110045415c8d674a8a5d0cdd587b9ce8e1f.tar.bz2 |
Wires up views on linux dialogs to use gtk ones.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/254007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r-- | chrome/browser/views/dialog_stubs_gtk.cc | 49 | ||||
-rw-r--r-- | chrome/browser/views/toolbar_view.cc | 4 |
2 files changed, 31 insertions, 22 deletions
diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc index 8df1833..c3a4e13 100644 --- a/chrome/browser/views/dialog_stubs_gtk.cc +++ b/chrome/browser/views/dialog_stubs_gtk.cc @@ -5,84 +5,91 @@ // This file contains stub implementations of the functions declared in // browser_dialogs.h that are currently unimplemented in GTK-views. +#include <gtk/gtk.h> + #include "base/logging.h" +#include "chrome/browser/gtk/about_chrome_dialog.h" #include "chrome/browser/fonts_languages_window.h" +#include "chrome/browser/gtk/bookmark_manager_gtk.h" +#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" +#include "chrome/browser/gtk/edit_search_engine_dialog.h" +#include "chrome/browser/gtk/keyword_editor_view.h" +#include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h" +#include "chrome/browser/gtk/repost_form_warning_gtk.h" +#include "chrome/browser/gtk/task_manager_gtk.h" #include "chrome/browser/options_window.h" #include "chrome/browser/views/browser_dialogs.h" +#include "views/widget/widget.h" namespace browser { void ShowBugReportView(views::Widget* parent, Profile* profile, TabContents* tab) { + // Bug report view hasn't been implemented on gtk yet. NOTIMPLEMENTED(); } void ShowClearBrowsingDataView(views::Widget* parent, Profile* profile) { - NOTIMPLEMENTED(); + ClearBrowsingDataDialogGtk::Show(GTK_WINDOW(parent->GetNativeView()), + profile); } void ShowSelectProfileDialog() { + // Only matters if we're going to support profile switching + // (switches::kEnableUserDataDirProfiles). NOTIMPLEMENTED(); } -void ShowImporterView(views::Widget* parent, - Profile* profile) { +void ShowImporterView(views::Widget* parent, Profile* profile) { + // Import currently doesn't matter. NOTIMPLEMENTED(); } void ShowBookmarkManagerView(Profile* profile) { - NOTIMPLEMENTED(); + BookmarkManagerGtk::Show(profile); } void ShowAboutChromeView(views::Widget* parent, Profile* profile) { - NOTIMPLEMENTED(); + ShowAboutDialogForProfile(GTK_WINDOW(parent->GetNativeView()), profile); } void ShowHtmlDialogView(gfx::NativeWindow parent, Browser* browser, HtmlDialogUIDelegate* delegate) { + // Hasn't been implemented yet on linux. NOTIMPLEMENTED(); } void ShowPasswordsExceptionsWindowView(Profile* profile) { - NOTIMPLEMENTED(); + ShowPasswordsExceptionsWindow(profile); } void ShowKeywordEditorView(Profile* profile) { - NOTIMPLEMENTED(); + KeywordEditorView::Show(profile); } void ShowNewProfileDialog() { + // Hasn't been implemented yet on linux. NOTIMPLEMENTED(); } void ShowTaskManager() { - NOTIMPLEMENTED(); + TaskManagerGtk::Show(); } void EditSearchEngine(gfx::NativeWindow parent, const TemplateURL* template_url, EditSearchEngineControllerDelegate* delegate, Profile* profile) { - NOTIMPLEMENTED(); + new EditSearchEngineDialog(GTK_WINDOW(parent), template_url, NULL, profile); } void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window, TabContents* tab_contents) { - NOTIMPLEMENTED(); + new RepostFormWarningGtk(GTK_WINDOW(parent_window), + &tab_contents->controller()); } } // namespace browser - -void ShowOptionsWindow(OptionsPage page, - OptionsGroup highlight_group, - Profile* profile) { - NOTIMPLEMENTED(); -} -void ShowFontsLanguagesWindow(gfx::NativeWindow window, - FontsLanguagesPage page, - Profile* profile) { - NOTIMPLEMENTED(); -} diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index fdf61b2..430bfef 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -1019,10 +1019,12 @@ void ToolbarView::CreatePageMenu() { page_menu_contents_->AddSeparator(); page_menu_contents_->AddSubMenuWithStringId( IDS_DEVELOPER_MENU, devtools_menu_contents_.get()); -#endif page_menu_contents_->AddSeparator(); page_menu_contents_->AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG); +#else + NOTIMPLEMENTED(); +#endif page_menu_menu_.reset(new views::Menu2(page_menu_contents_.get())); } |