diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 09:43:08 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-19 09:43:08 +0000 |
commit | 052313bd2f8ef1f994d65be5a5615bb2e9aa19f9 (patch) | |
tree | 883e79cee1112b90bd82890f6bffaf84688bb15f /chrome/browser/gtk/options | |
parent | f98f581eb3999563a71e8cf35c68420951c9f4e1 (diff) | |
download | chromium_src-052313bd2f8ef1f994d65be5a5615bb2e9aa19f9.zip chromium_src-052313bd2f8ef1f994d65be5a5615bb2e9aa19f9.tar.gz chromium_src-052313bd2f8ef1f994d65be5a5615bb2e9aa19f9.tar.bz2 |
Move pref_{member,service} and important_file_writer from chrome/common
to chrome/browser.
This is a part of an effort to remove bad dependency of chrome/common
on chrome/browser.
TEST=unit_tests and ui_tests, just moving code
BUG=none
Review URL: http://codereview.chromium.org/621004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options')
15 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 1ce4889..35d3856 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -26,12 +26,12 @@ #include "chrome/browser/net/dns_global.h" #include "chrome/browser/options_page_base.h" #include "chrome/browser/options_util.h" +#include "chrome/browser/pref_member.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/common/chrome_paths.h" #include "chrome/common/gtk_util.h" -#include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" #include "chrome/common/process_watcher.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.h b/chrome/browser/gtk/options/advanced_page_gtk.h index 151502b..5ead33c 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.h +++ b/chrome/browser/gtk/options/advanced_page_gtk.h @@ -9,7 +9,7 @@ #include "chrome/browser/gtk/options/advanced_contents_gtk.h" #include "chrome/browser/options_page_base.h" -#include "chrome/common/pref_member.h" +#include "chrome/browser/pref_member.h" class Profile; diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index 901c70a..18ea8c2 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -16,11 +16,11 @@ #include "chrome/browser/gtk/import_dialog_gtk.h" #include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index 1dbab9c..8552ec0 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -9,9 +9,9 @@ #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/options_page_base.h" +#include "chrome/browser/pref_member.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/common/pref_member.h" class ContentPageGtk : public OptionsPageBase, public ProfileSyncServiceObserver, diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.cc b/chrome/browser/gtk/options/content_settings_window_gtk.cc index 4b2b0c7..eeaecd5 100644 --- a/chrome/browser/gtk/options/content_settings_window_gtk.cc +++ b/chrome/browser/gtk/options/content_settings_window_gtk.cc @@ -9,12 +9,12 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/browser_window_gtk.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.h b/chrome/browser/gtk/options/content_settings_window_gtk.h index 40d5789..d6a1b91 100644 --- a/chrome/browser/gtk/options/content_settings_window_gtk.h +++ b/chrome/browser/gtk/options/content_settings_window_gtk.h @@ -11,8 +11,8 @@ #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/gtk/options/cookie_filter_page_gtk.h" #include "chrome/browser/gtk/options/content_filter_page_gtk.h" +#include "chrome/browser/pref_member.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/pref_member.h" class AccessibleWidgetHelper; diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h index e18f6db..7d805ca 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.h @@ -10,7 +10,7 @@ #include <string> #include "chrome/browser/options_page_base.h" -#include "chrome/common/pref_member.h" +#include "chrome/browser/pref_member.h" class Profile; diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h index 017d8f5..31e3fd3 100644 --- a/chrome/browser/gtk/options/fonts_page_gtk.h +++ b/chrome/browser/gtk/options/fonts_page_gtk.h @@ -12,8 +12,8 @@ #include <vector> #include "chrome/browser/character_encoding.h" +#include "chrome/browser/pref_member.h" #include "chrome/browser/options_page_base.h" -#include "chrome/common/pref_member.h" class FontsPageGtk : public OptionsPageBase { public: diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index 1396314..78aa693 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -13,6 +13,7 @@ #include "chrome/browser/gtk/options/options_layout_gtk.h" #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/session_startup_pref.h" @@ -20,7 +21,6 @@ #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h index efbf8d0..b394e6f 100644 --- a/chrome/browser/gtk/options/general_page_gtk.h +++ b/chrome/browser/gtk/options/general_page_gtk.h @@ -12,9 +12,9 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/options_page_base.h" +#include "chrome/browser/pref_member.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/shell_integration.h" -#include "chrome/common/pref_member.h" #include "googleurl/src/gurl.h" class Profile; diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h index 32ac703..4c396f3 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ b/chrome/browser/gtk/options/languages_page_gtk.h @@ -17,9 +17,9 @@ #include <string> #include "base/scoped_ptr.h" +#include "chrome/browser/pref_member.h" #include "chrome/browser/options_page_base.h" #include "chrome/common/gtk_tree.h" -#include "chrome/common/pref_member.h" #include "testing/gtest/include/gtest/gtest_prod.h" class LanguageComboboxModel; diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc index 82d868f..80b5642 100644 --- a/chrome/browser/gtk/options/options_window_gtk.cc +++ b/chrome/browser/gtk/options/options_window_gtk.cc @@ -16,14 +16,14 @@ #include "chrome/browser/gtk/options/advanced_page_gtk.h" #include "chrome/browser/gtk/options/content_page_gtk.h" #include "chrome/browser/gtk/options/general_page_gtk.h" +#include "chrome/browser/pref_member.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/accessibility_events.h" #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc index 7d77726..265289e 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc @@ -7,10 +7,10 @@ #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "chrome/browser/pref_service.h" #include "chrome/common/gtk_tree.h" #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc index 834fdbe..023ebb0 100644 --- a/chrome/browser/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_page_gtk.cc @@ -7,10 +7,10 @@ #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "chrome/browser/pref_service.h" #include "chrome/common/gtk_tree.h" #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index 026c29f..b08eef7 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -10,11 +10,11 @@ #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/possible_url_model.h" +#include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/gtk_tree.h" #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" |