diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 01:00:53 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 01:00:53 +0000 |
| commit | 0e3e3e3315a4233ba97c401a59bfd0bc452f46c5 (patch) | |
| tree | 3df57fad23330446089545a470f8e7ca725986ca /chrome/browser/browser.cc | |
| parent | 98b2361a19da857b0f663dd23e70483761360d76 (diff) | |
| download | chromium_src-0e3e3e3315a4233ba97c401a59bfd0bc452f46c5.zip chromium_src-0e3e3e3315a4233ba97c401a59bfd0bc452f46c5.tar.gz chromium_src-0e3e3e3315a4233ba97c401a59bfd0bc452f46c5.tar.bz2 | |
Add GTK options window (no options actually configurable yet.)
BUG=11507
Review URL: http://codereview.chromium.org/113377
Patch from Matt Mueller <mattm@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16023 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 5edfafc..dc35140 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -24,6 +24,7 @@ #include "chrome/browser/location_bar.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" @@ -68,7 +69,6 @@ #include "chrome/browser/debugger/debugger_window.h" #include "chrome/browser/dock_info.h" #include "chrome/browser/download/save_package.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/task_manager.h" #include "chrome/browser/user_data_manager.h" @@ -1116,12 +1116,14 @@ void Browser::OpenClearBrowsingDataDialog() { UserMetrics::RecordAction(L"ClearBrowsingData_ShowDlg", profile_); window_->ShowClearBrowsingDataDialog(); } +#endif void Browser::OpenOptionsDialog() { UserMetrics::RecordAction(L"ShowOptions", profile_); ShowOptionsWindow(OPTIONS_PAGE_DEFAULT, OPTIONS_GROUP_NONE, profile_); } +#if defined(OS_WIN) void Browser::OpenKeywordEditor() { UserMetrics::RecordAction(L"EditSearchEngines", profile_); window_->ShowSearchEnginesDialog(); @@ -1351,7 +1353,9 @@ void Browser::ExecuteCommandWithDisposition( Personalization::HandleMenuItemClick(profile()); break; #endif case IDC_CLEAR_BROWSING_DATA: OpenClearBrowsingDataDialog(); break; +#endif case IDC_OPTIONS: OpenOptionsDialog(); break; +#if defined(OS_WIN) case IDC_EDIT_SEARCH_ENGINES: OpenKeywordEditor(); break; case IDC_VIEW_PASSWORDS: OpenPasswordManager(); break; #endif |