diff options
Diffstat (limited to 'chrome/browser/ui')
19 files changed, 66 insertions, 66 deletions
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 5fdb3c1..14c1957 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -11,8 +11,8 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browsing_data_helper.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_helper.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chrome_page_zoom.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/download/download_util.h" diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 016c1cc7..3df5a83 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -9,13 +9,13 @@ #include "base/mac/bundle_locations.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_cookie_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h index 836bff1..489ce30 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h @@ -5,9 +5,9 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" #include "webkit/appcache/appcache_service.h" class CookieTreeNode; diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc index 302e3b1..9199b0c 100644 --- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc +++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc @@ -5,19 +5,19 @@ #include "chrome/browser/ui/gtk/collected_cookies_gtk.h" #include <string> -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_cookie_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/local_data_container.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/infobars/infobar_tab_helper.h" -#include "chrome/browser/local_data_container.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h" diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h index 2f72490..d55a8ee 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h +++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h @@ -9,10 +9,10 @@ #include <string> -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" class GURL; diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index fa3da03..7f9e2ee 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/collected_cookies_views.h" -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_cookie_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" diff --git a/chrome/browser/ui/views/indexed_db_info_view.h b/chrome/browser/ui/views/indexed_db_info_view.h index f6fc5df..22c134d 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.h +++ b/chrome/browser/ui/views/indexed_db_info_view.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_ -#include "chrome/browser/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" #include "ui/views/view.h" namespace views { diff --git a/chrome/browser/ui/views/local_storage_info_view.h b/chrome/browser/ui/views/local_storage_info_view.h index 3624a4d..06c801e 100644 --- a/chrome/browser/ui/views/local_storage_info_view.h +++ b/chrome/browser/ui/views/local_storage_info_view.h @@ -1,11 +1,11 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_ -#include "chrome/browser/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" #include "ui/views/view.h" namespace views { diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 7d3cbdf..91bfc11 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -13,12 +13,12 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browsing_data_cookie_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/local_shared_objects_container.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc index fb32972..53a11f9 100644 --- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc @@ -10,8 +10,8 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "chrome/browser/browsing_data_helper.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_helper.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h" #include "chrome/browser/policy/auto_enrollment_client.h" diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h index 258863c..fb8146e 100644 --- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h @@ -11,7 +11,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h" #include "chrome/browser/net/gaia/gaia_oauth_consumer.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index c81fd0d..a59cc41 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -14,8 +14,8 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/browsing_data_helper.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_helper.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/cros_settings.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 6f630db..d278147 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/system_key_event_listener.h" diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.h b/chrome/browser/ui/webui/extensions/pack_extension_handler.h index ec64872..c85d212 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/extensions/pack_extension_job.h" #include "chrome/browser/plugin_data_remover_helper.h" #include "chrome/browser/ui/select_file_dialog.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 52d1c9b..5a7e1ae 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -30,8 +30,8 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browsing_data_helper.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_helper.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_net_log.h" diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc index da693e0..332261a 100644 --- a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc @@ -10,8 +10,8 @@ #include "base/string16.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browsing_data_helper.h" -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_helper.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler.h b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h index 6ece636..5b6e485 100644 --- a/chrome/browser/ui/webui/options2/clear_browser_data_handler.h +++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_ -#include "chrome/browser/browsing_data_remover.h" +#include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/ui/webui/options2/options_ui.h" diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler.cc b/chrome/browser/ui/webui/options2/cookies_view_handler.cc index c1d4144..1817de1 100644 --- a/chrome/browser/ui/webui/options2/cookies_view_handler.cc +++ b/chrome/browser/ui/webui/options2/cookies_view_handler.cc @@ -12,14 +12,14 @@ #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_cookie_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" -#include "chrome/browser/browsing_data_quota_helper.h" -#include "chrome/browser/browsing_data_server_bound_cert_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_quota_helper.h" +#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/cookies_tree_model_util.h" diff --git a/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc index 663f5b2..112b75e 100644 --- a/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc +++ b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc @@ -7,11 +7,11 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_file_system_helper.h" -#include "chrome/browser/browsing_data_indexed_db_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" +#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" +#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" +#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" #include "chrome/browser/intents/web_intents_registry.h" #include "chrome/browser/intents/web_intents_registry_factory.h" #include "chrome/browser/profiles/profile.h" |