| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" | 5 #include "chrome/browser/ui/gtk/options/advanced_contents_gtk.h" |
| 6 | 6 |
| 7 #include <sys/types.h> | 7 #include <sys/types.h> |
| 8 #include <sys/wait.h> | 8 #include <sys/wait.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "app/gtk_signal.h" | |
| 14 #include "app/l10n_util.h" | 13 #include "app/l10n_util.h" |
| 15 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 16 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 17 #include "base/environment.h" | 16 #include "base/environment.h" |
| 18 #include "base/file_util.h" | 17 #include "base/file_util.h" |
| 19 #include "base/path_service.h" | 18 #include "base/path_service.h" |
| 20 #include "base/process_util.h" | 19 #include "base/process_util.h" |
| 21 #include "base/string_tokenizer.h" | 20 #include "base/string_tokenizer.h" |
| 22 #include "base/nix/xdg_util.h" | 21 #include "base/nix/xdg_util.h" |
| 23 #include "chrome/browser/browser_list.h" | 22 #include "chrome/browser/browser_list.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 40 #include "chrome/browser/ui/options/options_page_base.h" | 39 #include "chrome/browser/ui/options/options_page_base.h" |
| 41 #include "chrome/browser/ui/options/options_util.h" | 40 #include "chrome/browser/ui/options/options_util.h" |
| 42 #include "chrome/browser/ui/options/show_options_url.h" | 41 #include "chrome/browser/ui/options/show_options_url.h" |
| 43 #include "chrome/common/chrome_paths.h" | 42 #include "chrome/common/chrome_paths.h" |
| 44 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
| 45 #include "chrome/common/process_watcher.h" | 44 #include "chrome/common/process_watcher.h" |
| 46 #include "chrome/common/url_constants.h" | 45 #include "chrome/common/url_constants.h" |
| 47 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" |
| 48 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" |
| 49 #include "grit/locale_settings.h" | 48 #include "grit/locale_settings.h" |
| 49 #include "ui/base/gtk/gtk_signal.h" |
| 50 | 50 |
| 51 namespace { | 51 namespace { |
| 52 | 52 |
| 53 // Command used to configure GNOME proxy settings. The command was renamed | 53 // Command used to configure GNOME proxy settings. The command was renamed |
| 54 // in January 2009, so both are used to work on both old and new systems. | 54 // in January 2009, so both are used to work on both old and new systems. |
| 55 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL}; | 55 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL}; |
| 56 const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL}; | 56 const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL}; |
| 57 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. | 57 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. |
| 58 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; | 58 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; |
| 59 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; | 59 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1226 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), | 1226 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), |
| 1227 web_content_section_->get_page_widget(), false); | 1227 web_content_section_->get_page_widget(), false); |
| 1228 | 1228 |
| 1229 security_section_.reset(new SecuritySection(profile_)); | 1229 security_section_.reset(new SecuritySection(profile_)); |
| 1230 options_builder->AddOptionGroup( | 1230 options_builder->AddOptionGroup( |
| 1231 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), | 1231 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), |
| 1232 security_section_->get_page_widget(), false); | 1232 security_section_->get_page_widget(), false); |
| 1233 | 1233 |
| 1234 page_ = options_builder->get_page_widget(); | 1234 page_ = options_builder->get_page_widget(); |
| 1235 } | 1235 } |
| OLD | NEW |