Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Side by Side Diff: chrome/browser/gtk/options/advanced_contents_gtk.cc

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 15 matching lines...) Expand all
26 #include "chrome/browser/download/download_manager.h" 26 #include "chrome/browser/download/download_manager.h"
27 #include "chrome/browser/download/download_prefs.h" 27 #include "chrome/browser/download/download_prefs.h"
28 #include "chrome/browser/fonts_languages_window.h" 28 #include "chrome/browser/fonts_languages_window.h"
29 #include "chrome/browser/google/google_util.h" 29 #include "chrome/browser/google/google_util.h"
30 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" 30 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
31 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" 31 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
32 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 32 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
33 #include "chrome/browser/gtk/gtk_util.h" 33 #include "chrome/browser/gtk/gtk_util.h"
34 #include "chrome/browser/gtk/options/content_settings_window_gtk.h" 34 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
35 #include "chrome/browser/gtk/options/options_layout_gtk.h" 35 #include "chrome/browser/gtk/options/options_layout_gtk.h"
36 #include "chrome/browser/options_page_base.h"
37 #include "chrome/browser/options_util.h"
38 #include "chrome/browser/prefs/pref_member.h" 36 #include "chrome/browser/prefs/pref_member.h"
39 #include "chrome/browser/prefs/pref_set_observer.h" 37 #include "chrome/browser/prefs/pref_set_observer.h"
40 #include "chrome/browser/profile.h" 38 #include "chrome/browser/profile.h"
41 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 39 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
42 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 40 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
43 #include "chrome/browser/show_options_url.h" 41 #include "chrome/browser/ui/options/options_page_base.h"
42 #include "chrome/browser/ui/options/options_util.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" 45 #include "chrome/common/chrome_switches.h"
46 #include "chrome/common/pref_names.h" 46 #include "chrome/common/pref_names.h"
47 #include "chrome/common/process_watcher.h" 47 #include "chrome/common/process_watcher.h"
48 #include "chrome/common/url_constants.h" 48 #include "chrome/common/url_constants.h"
49 #include "grit/chromium_strings.h" 49 #include "grit/chromium_strings.h"
50 #include "grit/generated_resources.h" 50 #include "grit/generated_resources.h"
51 #include "grit/locale_settings.h" 51 #include "grit/locale_settings.h"
52 52
53 namespace { 53 namespace {
(...skipping 1177 matching lines...) Expand 10 before | Expand all | Expand 10 after
1231 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), 1231 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
1232 web_content_section_->get_page_widget(), false); 1232 web_content_section_->get_page_widget(), false);
1233 1233
1234 security_section_.reset(new SecuritySection(profile_)); 1234 security_section_.reset(new SecuritySection(profile_));
1235 options_builder->AddOptionGroup( 1235 options_builder->AddOptionGroup(
1236 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), 1236 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
1237 security_section_->get_page_widget(), false); 1237 security_section_->get_page_widget(), false);
1238 1238
1239 page_ = options_builder->get_page_widget(); 1239 page_ = options_builder->get_page_widget();
1240 } 1240 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/location_bar_view_gtk.cc ('k') | chrome/browser/gtk/options/advanced_page_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698