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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 months 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
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/fonts_languages_window.h" 26 #include "chrome/browser/fonts_languages_window.h"
27 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" 27 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
28 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" 28 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
29 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 29 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
30 #include "chrome/browser/gtk/gtk_util.h" 30 #include "chrome/browser/gtk/gtk_util.h"
31 #include "chrome/browser/gtk/options/content_settings_window_gtk.h" 31 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
32 #include "chrome/browser/gtk/options/options_layout_gtk.h" 32 #include "chrome/browser/gtk/options/options_layout_gtk.h"
33 #include "chrome/browser/net/predictor_api.h" 33 #include "chrome/browser/net/predictor_api.h"
34 #include "chrome/browser/options_page_base.h" 34 #include "chrome/browser/options_page_base.h"
35 #include "chrome/browser/options_util.h" 35 #include "chrome/browser/options_util.h"
36 #include "chrome/browser/pref_member.h" 36 #include "chrome/browser/prefs/pref_member.h"
37 #include "chrome/browser/pref_set_observer.h" 37 #include "chrome/browser/prefs/pref_set_observer.h"
38 #include "chrome/browser/profile.h" 38 #include "chrome/browser/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/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/pref_names.h" 42 #include "chrome/common/pref_names.h"
43 #include "chrome/common/process_watcher.h" 43 #include "chrome/common/process_watcher.h"
44 #include "grit/chromium_strings.h" 44 #include "grit/chromium_strings.h"
45 #include "grit/generated_resources.h" 45 #include "grit/generated_resources.h"
46 #include "grit/locale_settings.h" 46 #include "grit/locale_settings.h"
47 47
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), 1257 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
1258 web_content_section_->get_page_widget(), false); 1258 web_content_section_->get_page_widget(), false);
1259 1259
1260 security_section_.reset(new SecuritySection(profile_)); 1260 security_section_.reset(new SecuritySection(profile_));
1261 options_builder->AddOptionGroup( 1261 options_builder->AddOptionGroup(
1262 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), 1262 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
1263 security_section_->get_page_widget(), false); 1263 security_section_->get_page_widget(), false);
1264 1264
1265 page_ = options_builder->get_page_widget(); 1265 page_ = options_builder->get_page_widget();
1266 } 1266 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698