diff options
Diffstat (limited to 'chrome/browser/gtk/options')
14 files changed, 16 insertions, 17 deletions
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index ed8df68..fc61876 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -33,14 +33,14 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/content_settings_window_gtk.h" #include "chrome/browser/gtk/options/options_layout_gtk.h" -#include "chrome/browser/options_page_base.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/options_page_base.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.cc b/chrome/browser/gtk/options/advanced_page_gtk.cc index 8351322..0f404a3 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.cc +++ b/chrome/browser/gtk/options/advanced_page_gtk.cc @@ -6,8 +6,8 @@ #include "app/l10n_util.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/options/options_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.h b/chrome/browser/gtk/options/advanced_page_gtk.h index 193a6d6..f1345c8 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.h +++ b/chrome/browser/gtk/options/advanced_page_gtk.h @@ -11,8 +11,8 @@ #include "app/gtk_signal.h" #include "chrome/browser/gtk/options/advanced_contents_gtk.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.cc b/chrome/browser/gtk/options/content_filter_page_gtk.cc index d9b06a9..1e9172b 100644 --- a/chrome/browser/gtk/options/content_filter_page_gtk.cc +++ b/chrome/browser/gtk/options/content_filter_page_gtk.cc @@ -19,8 +19,8 @@ #include "chrome/browser/gtk/options/simple_content_exceptions_window.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification_exceptions_table_model.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.h b/chrome/browser/gtk/options/content_filter_page_gtk.h index 3b7bdec..d5d3de2 100644 --- a/chrome/browser/gtk/options/content_filter_page_gtk.h +++ b/chrome/browser/gtk/options/content_filter_page_gtk.h @@ -10,7 +10,7 @@ #include "app/gtk_signal.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/options_page_base.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index 286e28c..3ca408b 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -11,10 +11,10 @@ #include "app/gtk_signal.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/ui/options/options_page_base.h" class ContentPageGtk : public OptionsPageBase, public ProfileSyncServiceObserver { diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc index 955a200..9d3eb41 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc @@ -15,8 +15,8 @@ #include "chrome/browser/gtk/options/content_exceptions_window_gtk.h" #include "chrome/browser/gtk/options/cookies_view.h" #include "chrome/browser/profile.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h index 36b7181..f07cbdb 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.h @@ -12,8 +12,8 @@ #include "app/gtk_signal.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h index fc87863..3dbdf5a 100644 --- a/chrome/browser/gtk/options/fonts_page_gtk.h +++ b/chrome/browser/gtk/options/fonts_page_gtk.h @@ -14,8 +14,8 @@ #include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class DefaultEncodingComboboxModel; diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index ca34c7f..6f040ac 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -27,7 +27,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h index 0050b2b..05dac88 100644 --- a/chrome/browser/gtk/options/general_page_gtk.h +++ b/chrome/browser/gtk/options/general_page_gtk.h @@ -13,11 +13,11 @@ #include "app/gtk_signal.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/shell_integration.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "googleurl/src/gurl.h" class AccessibleWidgetHelper; diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h index 81712be..5fb41bb 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ b/chrome/browser/gtk/options/languages_page_gtk.h @@ -21,8 +21,8 @@ #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/gtk/gtk_tree.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class LanguageComboboxModel; class LanguageOrderTableModel; diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc index f593fa4..33aa1c6 100644 --- a/chrome/browser/gtk/options/options_window_gtk.cc +++ b/chrome/browser/gtk/options/options_window_gtk.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/options_window.h" - #include <gtk/gtk.h> #include "app/l10n_util.h" @@ -21,6 +19,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc index 33fa5b3..ac973b0 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc @@ -15,8 +15,8 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/passwords_exceptions_page_gtk.h" #include "chrome/browser/gtk/options/passwords_page_gtk.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/options/options_window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" |