diff options
| author | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 20:53:18 +0000 |
|---|---|---|
| committer | ibraaaa@google.com <ibraaaa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 20:53:18 +0000 |
| commit | 0f5e57f515094790fe2a8d638213c25314b8d3e8 (patch) | |
| tree | 0f840c7ba459b30ba27d68929f2d7d5c6b01e41d /chrome | |
| parent | 67990d826888e15984ffe09c85ecf7796fb18a79 (diff) | |
| download | chromium_src-0f5e57f515094790fe2a8d638213c25314b8d3e8.zip chromium_src-0f5e57f515094790fe2a8d638213c25314b8d3e8.tar.gz chromium_src-0f5e57f515094790fe2a8d638213c25314b8d3e8.tar.bz2 | |
Move chrome/browser/plugin_* to chrome/browser/plugins/
TBR=jhawkins@chromium.org
BUG=124396
Review URL: https://chromiumcodereview.appspot.com/10933044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
50 files changed, 117 insertions, 116 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 6e72e53..fd1abfa 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -71,7 +71,7 @@ #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_preview_tab_controller.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 65d1c7a..25e2b0c 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -58,7 +58,7 @@ #include "chrome/browser/page_cycler/page_cycler.h" #include "chrome/browser/performance_monitor/performance_monitor.h" #include "chrome/browser/performance_monitor/startup_timer.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc index ed6c6b6..f32987d 100644 --- a/chrome/browser/chrome_plugin_browsertest.cc +++ b/chrome/browser/chrome_plugin_browsertest.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/chrome_plugin_service_filter.cc b/chrome/browser/chrome_plugin_service_filter.cc index a5a1a0e..81f979e 100644 --- a/chrome/browser/chrome_plugin_service_filter.cc +++ b/chrome/browser/chrome_plugin_service_filter.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc index 283dbfa..2adff0b 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc @@ -23,7 +23,7 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index 7f7299b..832b0f3 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -9,8 +9,8 @@ #include "base/message_loop.h" #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/browser/chromeos/gview_request_interceptor.h" -#include "chrome/browser/plugin_prefs.h" -#include "chrome/browser/plugin_prefs_factory.h" +#include "chrome/browser/plugins/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs_factory.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/component_updater/npapi_flash_component_installer.cc b/chrome/browser/component_updater/npapi_flash_component_installer.cc index f17cfdb..d078380 100644 --- a/chrome/browser/component_updater/npapi_flash_component_installer.cc +++ b/chrome/browser/component_updater/npapi_flash_component_installer.cc @@ -16,7 +16,7 @@ #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/component_updater/component_updater_service.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/plugin_service.h" diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc index 5a41809..43fcf7d 100644 --- a/chrome/browser/component_updater/pepper_flash_component_installer.cc +++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc @@ -22,7 +22,7 @@ #include "base/version.h" #include "build/build_config.h" #include "chrome/browser/component_updater/component_updater_service.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/common/pepper_flash.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc index b95e84a..6a62c90 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc @@ -13,8 +13,8 @@ #include "base/values.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" -#include "chrome/browser/plugin_data_remover_helper.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_data_remover_helper.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 88647b0..770569f 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -18,8 +18,8 @@ #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/plugin_finder.h" -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_finder.h" +#include "chrome/browser/plugins/plugin_installer.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 9e650c1..fb87440 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -49,7 +49,7 @@ #include "chrome/browser/extensions/test_management_policy.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" -#include "chrome/browser/plugin_prefs_factory.h" +#include "chrome/browser/plugins/plugin_prefs_factory.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc index f88383b..8025882 100644 --- a/chrome/browser/metrics/metrics_log.cc +++ b/chrome/browser/metrics/metrics_log.cc @@ -26,7 +26,7 @@ #include "chrome/browser/autocomplete/autocomplete_provider.h" #include "chrome/browser/autocomplete/autocomplete_result.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome/browser/pepper_flash_settings_manager.cc b/chrome/browser/pepper_flash_settings_manager.cc index b39604d..df1acbc 100644 --- a/chrome/browser/pepper_flash_settings_manager.cc +++ b/chrome/browser/pepper_flash_settings_manager.cc @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/sequenced_task_runner_helpers.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/plugins/OWNERS b/chrome/browser/plugins/OWNERS new file mode 100644 index 0000000..00985a8 --- /dev/null +++ b/chrome/browser/plugins/OWNERS @@ -0,0 +1 @@ +bauerb@chromium.org diff --git a/chrome/browser/plugin_data_remover_helper.cc b/chrome/browser/plugins/plugin_data_remover_helper.cc index da1828f..f9e19ae 100644 --- a/chrome/browser/plugin_data_remover_helper.cc +++ b/chrome/browser/plugins/plugin_data_remover_helper.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_data_remover_helper.h" +#include "chrome/browser/plugins/plugin_data_remover_helper.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "content/public/browser/plugin_data_remover.h" #include "webkit/plugins/webplugininfo.h" diff --git a/chrome/browser/plugin_data_remover_helper.h b/chrome/browser/plugins/plugin_data_remover_helper.h index 4cc116b..92eac31 100644 --- a/chrome/browser/plugin_data_remover_helper.h +++ b/chrome/browser/plugins/plugin_data_remover_helper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_DATA_REMOVER_HELPER_H_ -#define CHROME_BROWSER_PLUGIN_DATA_REMOVER_HELPER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_DATA_REMOVER_HELPER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_DATA_REMOVER_HELPER_H_ class PluginPrefs; @@ -14,4 +14,4 @@ class PluginDataRemoverHelper { static bool IsSupported(PluginPrefs* plugin_prefs); }; -#endif // CHROME_BROWSER_PLUGIN_DATA_REMOVER_HELPER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_DATA_REMOVER_HELPER_H_ diff --git a/chrome/browser/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 21e8279..91d8016 100644 --- a/chrome/browser/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_finder.h" +#include "chrome/browser/plugins/plugin_finder.h" #include "base/bind.h" #include "base/json/json_reader.h" @@ -12,7 +12,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/plugin_finder.h b/chrome/browser/plugins/plugin_finder.h index b3fd718..199f43a 100644 --- a/chrome/browser/plugin_finder.h +++ b/chrome/browser/plugins/plugin_finder.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_FINDER_H_ -#define CHROME_BROWSER_PLUGIN_FINDER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ #include <map> #include <string> @@ -75,4 +75,4 @@ class PluginFinder { DISALLOW_COPY_AND_ASSIGN(PluginFinder); }; -#endif // CHROME_BROWSER_PLUGIN_FINDER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ diff --git a/chrome/browser/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc index 8d3d46b..8f44ddb 100644 --- a/chrome/browser/plugin_finder_unittest.cc +++ b/chrome/browser/plugins/plugin_finder_unittest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_finder.h" +#include "chrome/browser/plugins/plugin_finder.h" #include "base/values.h" -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc index a8c04fc..8951eaa 100644 --- a/chrome/browser/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_infobar_delegates.h" +#include "chrome/browser/plugins/plugin_infobar_delegates.h" #include "base/utf_string_conversions.h" #include "chrome/browser/api/infobars/infobar_service.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/plugin_observer.h" +#include "chrome/browser/plugins/plugin_observer.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" @@ -29,7 +29,7 @@ #endif #if defined(ENABLE_PLUGIN_INSTALLATION) -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" #endif // defined(ENABLE_PLUGIN_INSTALLATION) using content::OpenURLParams; diff --git a/chrome/browser/plugin_infobar_delegates.h b/chrome/browser/plugins/plugin_infobar_delegates.h index 03b18ba..2a829d9 100644 --- a/chrome/browser/plugin_infobar_delegates.h +++ b/chrome/browser/plugins/plugin_infobar_delegates.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_INFOBAR_DELEGATES_H_ -#define CHROME_BROWSER_PLUGIN_INFOBAR_DELEGATES_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_ #include "base/callback.h" #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" #include "googleurl/src/gurl.h" #if defined(ENABLE_PLUGIN_INSTALLATION) -#include "chrome/browser/plugin_installer_observer.h" +#include "chrome/browser/plugins/plugin_installer_observer.h" #endif // defined(ENABLE_PLUGIN_INSTALLATION) class InfoBarService; @@ -199,4 +199,4 @@ class PluginMetroModeInfoBarDelegate : public ConfirmInfoBarDelegate { }; #endif // defined(OS_WIN) -#endif // CHROME_BROWSER_PLUGIN_INFOBAR_DELEGATES_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_INFOBAR_DELEGATES_H_ diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc index 10bbd44..79e0681 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugins/plugin_installer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" #include "base/bind.h" #include "base/bind_helpers.h" @@ -12,7 +12,7 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/plugin_installer_observer.h" +#include "chrome/browser/plugins/plugin_installer_observer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "content/public/browser/browser_context.h" diff --git a/chrome/browser/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h index 85a7f6f..1dae7f1 100644 --- a/chrome/browser/plugin_installer.h +++ b/chrome/browser/plugins/plugin_installer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_INSTALLER_H_ -#define CHROME_BROWSER_PLUGIN_INSTALLER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_ #include "base/observer_list.h" #include "base/string16.h" @@ -125,4 +125,4 @@ class PluginInstaller : public content::DownloadItem::Observer { DISALLOW_COPY_AND_ASSIGN(PluginInstaller); }; -#endif // CHROME_BROWSER_PLUGIN_INSTALLER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_ diff --git a/chrome/browser/plugin_installer_observer.cc b/chrome/browser/plugins/plugin_installer_observer.cc index 32cba97..bf98d7d 100644 --- a/chrome/browser/plugin_installer_observer.cc +++ b/chrome/browser/plugins/plugin_installer_observer.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_installer_observer.h" +#include "chrome/browser/plugins/plugin_installer_observer.h" -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" PluginInstallerObserver::PluginInstallerObserver(PluginInstaller* installer) : installer_(installer) { diff --git a/chrome/browser/plugin_installer_observer.h b/chrome/browser/plugins/plugin_installer_observer.h index e63dee8..e767bc1 100644 --- a/chrome/browser/plugin_installer_observer.h +++ b/chrome/browser/plugins/plugin_installer_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_INSTALLER_OBSERVER_H_ -#define CHROME_BROWSER_PLUGIN_INSTALLER_OBSERVER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_OBSERVER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_OBSERVER_H_ #include <string> @@ -43,4 +43,4 @@ class WeakPluginInstallerObserver : public PluginInstallerObserver { virtual void OnlyWeakObserversLeft(); }; -#endif // CHROME_BROWSER_PLUGIN_INSTALLER_OBSERVER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_OBSERVER_H_ diff --git a/chrome/browser/plugin_installer_unittest.cc b/chrome/browser/plugins/plugin_installer_unittest.cc index fd90cec..1831212 100644 --- a/chrome/browser/plugin_installer_unittest.cc +++ b/chrome/browser/plugins/plugin_installer_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 885206b..de6d6f8 100644 --- a/chrome/browser/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_observer.h" +#include "chrome/browser/plugins/plugin_observer.h" #include "base/auto_reset.h" #include "base/bind.h" @@ -14,8 +14,8 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/plugin_finder.h" -#include "chrome/browser/plugin_infobar_delegates.h" +#include "chrome/browser/plugins/plugin_finder.h" +#include "chrome/browser/plugins/plugin_infobar_delegates.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -32,8 +32,8 @@ #include "webkit/plugins/webplugininfo.h" #if defined(ENABLE_PLUGIN_INSTALLATION) -#include "chrome/browser/plugin_installer.h" -#include "chrome/browser/plugin_installer_observer.h" +#include "chrome/browser/plugins/plugin_installer.h" +#include "chrome/browser/plugins/plugin_installer_observer.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" #endif // defined(ENABLE_PLUGIN_INSTALLATION) diff --git a/chrome/browser/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h index 6c568a4..d2d6e11 100644 --- a/chrome/browser/plugin_observer.h +++ b/chrome/browser/plugins/plugin_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_OBSERVER_H_ -#define CHROME_BROWSER_PLUGIN_OBSERVER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h" @@ -70,4 +70,4 @@ class PluginObserver : public content::WebContentsObserver { DISALLOW_COPY_AND_ASSIGN(PluginObserver); }; -#endif // CHROME_BROWSER_PLUGIN_OBSERVER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_OBSERVER_H_ diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index 4a8da49..596aeb0 100644 --- a/chrome/browser/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include <string> @@ -14,8 +14,8 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h" -#include "chrome/browser/plugin_installer.h" -#include "chrome/browser/plugin_prefs_factory.h" +#include "chrome/browser/plugins/plugin_installer.h" +#include "chrome/browser/plugins/plugin_prefs_factory.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 56ecaa7..14fef59 100644 --- a/chrome/browser/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_PREFS_H_ -#define CHROME_BROWSER_PLUGIN_PREFS_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_ #include <map> #include <set> @@ -13,7 +13,7 @@ #include "base/file_path.h" #include "base/synchronization/lock.h" #include "chrome/browser/api/prefs/pref_change_registrar.h" -#include "chrome/browser/plugin_finder.h" +#include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" #include "content/public/browser/notification_observer.h" @@ -201,4 +201,4 @@ class PluginPrefs : public RefcountedProfileKeyedService, DISALLOW_COPY_AND_ASSIGN(PluginPrefs); }; -#endif // CHROME_BROWSER_PLUGIN_PREFS_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_ diff --git a/chrome/browser/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc index 75b7f26..9f29718 100644 --- a/chrome/browser/plugin_prefs_factory.cc +++ b/chrome/browser/plugins/plugin_prefs_factory.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_prefs_factory.h" +#include "chrome/browser/plugins/plugin_prefs_factory.h" #include "base/path_service.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" diff --git a/chrome/browser/plugin_prefs_factory.h b/chrome/browser/plugins/plugin_prefs_factory.h index e735c4c..ae6e080 100644 --- a/chrome/browser/plugin_prefs_factory.h +++ b/chrome/browser/plugins/plugin_prefs_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_PREFS_FACTORY_H_ -#define CHROME_BROWSER_PLUGIN_PREFS_FACTORY_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_FACTORY_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_FACTORY_H_ #include "base/compiler_specific.h" #include "base/memory/singleton.h" @@ -42,4 +42,4 @@ class PluginPrefsFactory : public RefcountedProfileKeyedServiceFactory { virtual bool ServiceIsCreatedWithProfile() const OVERRIDE; }; -#endif // CHROME_BROWSER_PLUGIN_PREFS_FACTORY_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_FACTORY_H_ diff --git a/chrome/browser/plugin_prefs_unittest.cc b/chrome/browser/plugins/plugin_prefs_unittest.cc index 5ae3647..155609e 100644 --- a/chrome/browser/plugin_prefs_unittest.cc +++ b/chrome/browser/plugins/plugin_prefs_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "base/at_exit.h" #include "base/bind.h" diff --git a/chrome/browser/plugin_status_pref_setter.cc b/chrome/browser/plugins/plugin_status_pref_setter.cc index a3dd743..dc3a91a 100644 --- a/chrome/browser/plugin_status_pref_setter.cc +++ b/chrome/browser/plugins/plugin_status_pref_setter.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/plugin_status_pref_setter.h" +#include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "base/bind.h" #include "chrome/browser/pepper_flash_settings_manager.h" -#include "chrome/browser/plugin_data_remover_helper.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_data_remover_helper.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h index 8381281..ab406ae 100644 --- a/chrome/browser/plugin_status_pref_setter.h +++ b/chrome/browser/plugins/plugin_status_pref_setter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PLUGIN_STATUS_PREF_SETTER_H_ -#define CHROME_BROWSER_PLUGIN_STATUS_PREF_SETTER_H_ +#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_STATUS_PREF_SETTER_H_ +#define CHROME_BROWSER_PLUGINS_PLUGIN_STATUS_PREF_SETTER_H_ #include <vector> @@ -68,4 +68,4 @@ class PluginStatusPrefSetter : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(PluginStatusPrefSetter); }; -#endif // CHROME_BROWSER_PLUGIN_STATUS_PREF_SETTER_H_ +#endif // CHROME_BROWSER_PLUGINS_PLUGIN_STATUS_PREF_SETTER_H_ diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 4151907..d5dcfdd 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -29,7 +29,7 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_map.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 722a17a..a05c6dc 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -30,7 +30,7 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/proxy_service_factory.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_dependency_manager.h" diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc index 20d03bd..ac036ae 100644 --- a/chrome/browser/profiles/profile_dependency_manager.cc +++ b/chrome/browser/profiles/profile_dependency_manager.cc @@ -25,7 +25,7 @@ #include "chrome/browser/media_gallery/media_galleries_preferences_factory.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" -#include "chrome/browser/plugin_prefs_factory.h" +#include "chrome/browser/plugins/plugin_prefs_factory.h" #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" #include "chrome/browser/predictors/predictor_database_factory.h" #include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 9fc6403..93f8489 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -49,7 +49,7 @@ #include "chrome/browser/net/proxy_service_factory.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/policy/policy_service.h" #include "chrome/browser/policy/user_cloud_policy_manager.h" #include "chrome/browser/prefs/browser_prefs.h" diff --git a/chrome/browser/renderer_host/plugin_info_message_filter.cc b/chrome/browser/renderer_host/plugin_info_message_filter.cc index a00f5d8..f495ab6 100644 --- a/chrome/browser/renderer_host/plugin_info_message_filter.cc +++ b/chrome/browser/renderer_host/plugin_info_message_filter.cc @@ -23,8 +23,8 @@ #include "webkit/plugins/npapi/plugin_list.h" #if defined(ENABLE_PLUGIN_INSTALLATION) -#include "chrome/browser/plugin_finder.h" -#include "chrome/browser/plugin_installer.h" +#include "chrome/browser/plugins/plugin_finder.h" +#include "chrome/browser/plugins/plugin_installer.h" #endif using content::PluginService; diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc index 15767b1..3f55439 100644 --- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc +++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc @@ -12,9 +12,9 @@ #include "chrome/browser/chrome_plugin_service_filter.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/plugin_finder.h" -#include "chrome/browser/plugin_installer.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_finder.h" +#include "chrome/browser/plugins/plugin_installer.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc index d05c49d..fbe6b51 100644 --- a/chrome/browser/ui/tab_contents/tab_contents.cc +++ b/chrome/browser/ui/tab_contents/tab_contents.cc @@ -22,7 +22,7 @@ #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/password_manager/password_manager_delegate_impl.h" #include "chrome/browser/pepper_broker_observer.h" -#include "chrome/browser/plugin_observer.h" +#include "chrome/browser/plugins/plugin_observer.h" #include "chrome/browser/prerender/prerender_tab_helper.h" #include "chrome/browser/printing/print_preview_message_handler.h" #include "chrome/browser/printing/print_view_manager.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 3b732e2..69262e5 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -37,7 +37,7 @@ #include "chrome/browser/memory_details.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_dialogs.h" diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.h b/chrome/browser/ui/webui/extensions/pack_extension_handler.h index 85aafc5..12e7200 100644 --- a/chrome/browser/ui/webui/extensions/pack_extension_handler.h +++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.h @@ -9,7 +9,7 @@ #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/plugins/plugin_data_remover_helper.h" #include "content/public/browser/web_ui_message_handler.h" #include "ui/base/dialogs/select_file_dialog.h" diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 5ed2037..9463d47 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -20,7 +20,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/crash_upload_list.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 4637cc0..b65485f 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc @@ -16,7 +16,7 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index 5495451..f1fbf7b 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -10,7 +10,7 @@ #include "base/values.h" #include "chrome/browser/api/prefs/pref_change_registrar.h" -#include "chrome/browser/plugin_status_pref_setter.h" +#include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 310d325..0b655ec 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -19,9 +19,9 @@ #include "base/values.h" #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/plugin_finder.h" -#include "chrome/browser/plugin_installer.h" -#include "chrome/browser/plugin_prefs.h" +#include "chrome/browser/plugins/plugin_finder.h" +#include "chrome/browser/plugins/plugin_installer.h" +#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index bd10c58..07edd51 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1223,24 +1223,24 @@ 'browser/platform_util_linux.cc', 'browser/platform_util_mac.mm', 'browser/platform_util_win.cc', - 'browser/plugin_data_remover_helper.cc', - 'browser/plugin_data_remover_helper.h', - 'browser/plugin_finder.cc', - 'browser/plugin_finder.h', - 'browser/plugin_installer.cc', - 'browser/plugin_installer.h', - 'browser/plugin_infobar_delegates.cc', - 'browser/plugin_infobar_delegates.h', - 'browser/plugin_installer_observer.cc', - 'browser/plugin_installer_observer.h', - 'browser/plugin_observer.cc', - 'browser/plugin_observer.h', - 'browser/plugin_prefs.cc', - 'browser/plugin_prefs.h', - 'browser/plugin_prefs_factory.cc', - 'browser/plugin_prefs_factory.h', - 'browser/plugin_status_pref_setter.cc', - 'browser/plugin_status_pref_setter.h', + 'browser/plugins/plugin_data_remover_helper.cc', + 'browser/plugins/plugin_data_remover_helper.h', + 'browser/plugins/plugin_finder.cc', + 'browser/plugins/plugin_finder.h', + 'browser/plugins/plugin_installer.cc', + 'browser/plugins/plugin_installer.h', + 'browser/plugins/plugin_infobar_delegates.cc', + 'browser/plugins/plugin_infobar_delegates.h', + 'browser/plugins/plugin_installer_observer.cc', + 'browser/plugins/plugin_installer_observer.h', + 'browser/plugins/plugin_observer.cc', + 'browser/plugins/plugin_observer.h', + 'browser/plugins/plugin_prefs.cc', + 'browser/plugins/plugin_prefs.h', + 'browser/plugins/plugin_prefs_factory.cc', + 'browser/plugins/plugin_prefs_factory.h', + 'browser/plugins/plugin_status_pref_setter.cc', + 'browser/plugins/plugin_status_pref_setter.h', 'browser/policy/async_policy_loader.cc', 'browser/policy/async_policy_loader.h', 'browser/policy/async_policy_provider.cc', @@ -2675,8 +2675,8 @@ ['enable_plugin_installation==0', { 'sources!': [ # TODO(ibraaaa): Return plugin_installer.{h/cc}. - 'browser/plugin_installer_observer.cc', - 'browser/plugin_installer_observer.h', + 'browser/plugins/plugin_installer_observer.cc', + 'browser/plugins/plugin_installer_observer.h', ], }], ['enable_protector_service==0', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d982233..10add67 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1437,9 +1437,9 @@ 'browser/password_manager/password_store_win_unittest.cc', 'browser/password_manager/password_store_x_unittest.cc', 'browser/performance_monitor/database_unittest.cc', - 'browser/plugin_finder_unittest.cc', - 'browser/plugin_installer_unittest.cc', - 'browser/plugin_prefs_unittest.cc', + 'browser/plugins/plugin_finder_unittest.cc', + 'browser/plugins/plugin_installer_unittest.cc', + 'browser/plugins/plugin_prefs_unittest.cc', 'browser/policy/async_policy_provider_unittest.cc', 'browser/policy/auto_enrollment_client_unittest.cc', 'browser/policy/cloud_policy_client_unittest.cc', @@ -2574,8 +2574,8 @@ }], ['enable_plugin_installation==0', { 'sources!': [ - 'browser/plugin_finder_unittest.cc', - 'browser/plugin_installer_unittest.cc', + 'browser/plugins/plugin_finder_unittest.cc', + 'browser/plugins/plugin_installer_unittest.cc', ], }], ['enable_protector_service==0', { |