| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/gtk/options/advanced_contents_gtk.h" | 5 #include "chrome/browser/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> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/browser/gtk/options/options_layout_gtk.h" | 35 #include "chrome/browser/gtk/options/options_layout_gtk.h" |
| 36 #include "chrome/browser/prefs/pref_member.h" | 36 #include "chrome/browser/prefs/pref_member.h" |
| 37 #include "chrome/browser/prefs/pref_set_observer.h" | 37 #include "chrome/browser/prefs/pref_set_observer.h" |
| 38 #include "chrome/browser/profiles/profile.h" | 38 #include "chrome/browser/profiles/profile.h" |
| 39 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 39 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
| 40 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 40 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 41 #include "chrome/browser/ui/options/options_page_base.h" | 41 #include "chrome/browser/ui/options/options_page_base.h" |
| 42 #include "chrome/browser/ui/options/options_util.h" | 42 #include "chrome/browser/ui/options/options_util.h" |
| 43 #include "chrome/browser/ui/options/show_options_url.h" | 43 #include "chrome/browser/ui/options/show_options_url.h" |
| 44 #include "chrome/common/chrome_paths.h" | 44 #include "chrome/common/chrome_paths.h" |
| 45 #include "chrome/common/chrome_switches.h" | |
| 46 #include "chrome/common/pref_names.h" | 45 #include "chrome/common/pref_names.h" |
| 47 #include "chrome/common/process_watcher.h" | 46 #include "chrome/common/process_watcher.h" |
| 48 #include "chrome/common/url_constants.h" | 47 #include "chrome/common/url_constants.h" |
| 49 #include "grit/chromium_strings.h" | 48 #include "grit/chromium_strings.h" |
| 50 #include "grit/generated_resources.h" | 49 #include "grit/generated_resources.h" |
| 51 #include "grit/locale_settings.h" | 50 #include "grit/locale_settings.h" |
| 52 | 51 |
| 53 namespace { | 52 namespace { |
| 54 | 53 |
| 55 // Command used to configure GNOME proxy settings. The command was renamed | 54 // Command used to configure GNOME proxy settings. The command was renamed |
| (...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), | 1208 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), |
| 1210 web_content_section_->get_page_widget(), false); | 1209 web_content_section_->get_page_widget(), false); |
| 1211 | 1210 |
| 1212 security_section_.reset(new SecuritySection(profile_)); | 1211 security_section_.reset(new SecuritySection(profile_)); |
| 1213 options_builder->AddOptionGroup( | 1212 options_builder->AddOptionGroup( |
| 1214 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), | 1213 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), |
| 1215 security_section_->get_page_widget(), false); | 1214 security_section_->get_page_widget(), false); |
| 1216 | 1215 |
| 1217 page_ = options_builder->get_page_widget(); | 1216 page_ = options_builder->get_page_widget(); |
| 1218 } | 1217 } |
| OLD | NEW |