diff options
Diffstat (limited to 'chrome/browser/extensions')
16 files changed, 33 insertions, 26 deletions
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/extensions/extension_bookmarks_module.h index 5a22f58..8dc795e 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.h +++ b/chrome/browser/extensions/extension_bookmarks_module.h @@ -6,12 +6,10 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_H_ #include <string> -#include <vector> #include "base/singleton.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/extensions/extension_function.h" -#include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/common/notification_registrar.h" // Observes BookmarkModel and then routes the notifications as events to diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h index 034b2fd..a134169 100644 --- a/chrome/browser/extensions/extension_browser_event_router.h +++ b/chrome/browser/extensions/extension_browser_event_router.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_BROWSER_EVENT_ROUTER_H_ #include <map> -#include <vector> #include <string> #include "base/basictypes.h" diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h index 129e152..e2446e3 100755 --- a/chrome/browser/extensions/extension_creator.h +++ b/chrome/browser/extensions/extension_creator.h @@ -5,10 +5,16 @@ #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_CREATOR_H_ #define CHROME_COMMON_EXTENSIONS_EXTENSION_CREATOR_H_ -#include "base/command_line.h" -#include "base/crypto/rsa_private_key.h" -#include "base/file_path.h" -#include "base/values.h" +#include <string> +#include <vector> + +#include "base/basictypes.h" + +namespace base { +class RSAPrivateKey; +} + +class FilePath; // This class create an installable extension (.crx file) given an input // directory that contains a valid manifest.json and the extension's resources diff --git a/chrome/browser/extensions/extension_function_dispatcher.h b/chrome/browser/extensions/extension_function_dispatcher.h index 8375ae4..b59e256 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.h +++ b/chrome/browser/extensions/extension_function_dispatcher.h @@ -5,12 +5,10 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_ -#include <map> #include <string> #include <vector> #include "base/ref_counted.h" -#include "base/values.h" class Browser; class ExtensionFunction; diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 4b7ba14..39570a1 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -12,6 +12,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_view.h" +#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/resource_message_filter.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h index ef6c1ec..2a0a2bc 100644 --- a/chrome/browser/extensions/extension_message_service.h +++ b/chrome/browser/extensions/extension_message_service.h @@ -10,7 +10,7 @@ #include <string> #include "base/lock.h" -#include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/common/ipc_message.h" #include "chrome/common/notification_registrar.h" class MessageLoop; diff --git a/chrome/browser/extensions/extension_protocols.h b/chrome/browser/extensions/extension_protocols.h index b76c31c..b4fc7da 100644 --- a/chrome/browser/extensions/extension_protocols.h +++ b/chrome/browser/extensions/extension_protocols.h @@ -5,8 +5,6 @@ #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_ #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_ -#include "base/file_path.h" - // Registers support for the extension URL scheme. void RegisterExtensionProtocols(); diff --git a/chrome/browser/extensions/extension_shelf.cc b/chrome/browser/extensions/extension_shelf.cc index 3978d19..72b168f 100644 --- a/chrome/browser/extensions/extension_shelf.cc +++ b/chrome/browser/extensions/extension_shelf.cc @@ -4,10 +4,14 @@ #include "chrome/browser/extensions/extension_shelf.h" +#include <algorithm> + #include "app/resource_bundle.h" #include "base/logging.h" +#include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser.h" +#include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_view.h" #include "chrome/browser/extensions/extensions_service.h" diff --git a/chrome/browser/extensions/extension_shelf_model.h b/chrome/browser/extensions/extension_shelf_model.h index 5b03795..5ff1b45 100644 --- a/chrome/browser/extensions/extension_shelf_model.h +++ b/chrome/browser/extensions/extension_shelf_model.h @@ -11,10 +11,10 @@ #include "base/observer_list.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" -#include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extensions_service.h" class Browser; +class ExtensionHost; class ExtensionView; // Objects implement this interface when they wish to be notified of changes to diff --git a/chrome/browser/extensions/extension_shelf_model_unittest.cc b/chrome/browser/extensions/extension_shelf_model_unittest.cc index 82ce02e..513f281 100644 --- a/chrome/browser/extensions/extension_shelf_model_unittest.cc +++ b/chrome/browser/extensions/extension_shelf_model_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/browser.h" +#include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_shelf_model.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/test_extension_loader.h" diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index b759349..8bf49f8 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -10,15 +10,12 @@ #include <string> #include <vector> -#include "base/command_line.h" #include "base/file_path.h" #include "base/linked_ptr.h" -#include "base/message_loop.h" #include "base/ref_counted.h" -#include "base/task.h" +#include "base/tuple.h" #include "base/values.h" #include "chrome/browser/extensions/external_extension_provider.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" class Browser; @@ -26,6 +23,7 @@ class DictionaryValue; class Extension; class ExtensionsServiceBackend; class GURL; +class MessageLoop; class PrefService; class Profile; class ResourceDispatcherHost; diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index af69ec6..02ad15f 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" +#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extensions_ui.h b/chrome/browser/extensions/extensions_ui.h index 417fd00..80e0137 100644 --- a/chrome/browser/extensions/extensions_ui.h +++ b/chrome/browser/extensions/extensions_ui.h @@ -8,14 +8,16 @@ #include <string> #include <vector> -#include "base/values.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/dom_ui.h" -#include "chrome/browser/extensions/extensions_service.h" #include "googleurl/src/gurl.h" -class GURL; +class DictionaryValue; +class Extension; +class ExtensionsService; +class FilePath; class UserScript; +class Value; // Information about a page running in an extension, for example a toolstrip, // a background page, or a tab contents. diff --git a/chrome/browser/extensions/test_extension_loader.h b/chrome/browser/extensions/test_extension_loader.h index e0ef193..ddf5585 100644 --- a/chrome/browser/extensions/test_extension_loader.h +++ b/chrome/browser/extensions/test_extension_loader.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_LOADER_H_ #define CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_LOADER_H_ -#include "chrome/common/extensions/extension.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 5d28cb4..5cf3696 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -34,6 +34,11 @@ static bool GetDeclarationValue(const StringPiece& line, return true; } +UserScriptMaster::ScriptReloader::ScriptReloader(UserScriptMaster* master) + : master_(master), + master_message_loop_(MessageLoop::current()) { +} + // static bool UserScriptMaster::ScriptReloader::ParseMetadataHeader( const StringPiece& script_text, UserScript* script) { diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h index 4367c7e..7a73323 100644 --- a/chrome/browser/extensions/user_script_master.h +++ b/chrome/browser/extensions/user_script_master.h @@ -9,15 +9,13 @@ #include "base/directory_watcher.h" #include "base/file_path.h" -#include "base/message_loop.h" -#include "base/process.h" #include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/notification_registrar.h" -#include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest_prod.h" +class MessageLoop; class StringPiece; // Manages a segment of shared memory that contains the user scripts the user @@ -78,8 +76,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>, static void LoadScriptsFromDirectory(const FilePath script_dir, UserScriptList* result); - explicit ScriptReloader(UserScriptMaster* master) - : master_(master), master_message_loop_(MessageLoop::current()) {} + explicit ScriptReloader(UserScriptMaster* master); // Start a scan for scripts. // Will always send a message to the master upon completion. |