diff options
Diffstat (limited to 'chrome')
36 files changed, 21 insertions, 40 deletions
diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc index efbf60a..836d94c 100644 --- a/chrome/browser/extensions/active_tab_apitest.cc +++ b/chrome/browser/extensions/active_tab_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/activity_actions.h b/chrome/browser/extensions/activity_actions.h index 98a7bca..cd04bac 100644 --- a/chrome/browser/extensions/activity_actions.h +++ b/chrome/browser/extensions/activity_actions.h @@ -9,8 +9,8 @@ #include "base/memory/ref_counted_memory.h" #include "base/time.h" #include "base/values.h" -#include "chrome/browser/history/url_database.h" #include "sql/connection.h" +#include "sql/statement.h" #include "sql/transaction.h" namespace extensions { @@ -58,4 +58,3 @@ class Action : public base::RefCountedThreadSafe<Action> { } // namespace extensions #endif // CHROME_BROWSER_EXTENSIONS_ACTIVITY_ACTIONS_H_ - diff --git a/chrome/browser/extensions/activity_database.cc b/chrome/browser/extensions/activity_database.cc index f149d9e..46064c7 100644 --- a/chrome/browser/extensions/activity_database.cc +++ b/chrome/browser/extensions/activity_database.cc @@ -8,7 +8,6 @@ #include "base/stringprintf.h" #include "base/time/clock.h" #include "chrome/browser/extensions/activity_database.h" -#include "chrome/browser/history/url_database.h" #include "content/public/browser/browser_thread.h" #include "sql/transaction.h" diff --git a/chrome/browser/extensions/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log_browsertest.cc index 9c4b532..52bfaa2 100644 --- a/chrome/browser/extensions/activity_log_browsertest.cc +++ b/chrome/browser/extensions/activity_log_browsertest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -55,4 +54,3 @@ IN_PROC_BROWSER_TEST_F(ActivityLogExtensionTest, ExtensionEndToEnd) { } } // namespace extensions - diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index 7acf586..eab2002 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -31,6 +31,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "extensions/common/error_utils.h" +#include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" namespace extensions { diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 8ade2fa..81f0fa4 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -219,6 +219,12 @@ gfx::Image OmniboxAPI::GetOmniboxPopupIcon(const std::string& extension_id) { omnibox_popup_icon_manager_.GetIcon(extension_id)); } +template <> +void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() { + DependsOn(ExtensionSystemFactory::GetInstance()); + DependsOn(TemplateURLServiceFactory::GetInstance()); +} + bool OmniboxSendSuggestionsFunction::RunImpl() { ExtensionOmniboxSuggestions suggestions; ListValue* suggestions_value; diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index 5c05302..876a77f 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h @@ -130,6 +130,9 @@ class OmniboxAPI : public ProfileKeyedAPI, DISALLOW_COPY_AND_ASSIGN(OmniboxAPI); }; +template <> +void ProfileKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies(); + class OmniboxSetDefaultSuggestionFunction : public SyncExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("omnibox.setDefaultSuggestion", diff --git a/chrome/browser/extensions/app_shortcut_manager.cc b/chrome/browser/extensions/app_shortcut_manager.cc index 219894b..d1c5a4f 100644 --- a/chrome/browser/extensions/app_shortcut_manager.cc +++ b/chrome/browser/extensions/app_shortcut_manager.cc @@ -11,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/app_shortcut_manager.h b/chrome/browser/extensions/app_shortcut_manager.h index 2287395..35b7317 100644 --- a/chrome/browser/extensions/app_shortcut_manager.h +++ b/chrome/browser/extensions/app_shortcut_manager.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_EXTENSIONS_APP_SHORTCUT_MANAGER_H_ #include "base/memory/weak_ptr.h" -#include "chrome/browser/shell_integration.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/browser_extension_window_controller.cc b/chrome/browser/extensions/browser_extension_window_controller.cc index 9e50e50..be8c349 100644 --- a/chrome/browser/extensions/browser_extension_window_controller.cc +++ b/chrome/browser/extensions/browser_extension_window_controller.cc @@ -10,7 +10,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 6880c8b..6af173b 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -11,7 +11,6 @@ #include "base/prefs/pref_notifier.h" #include "base/prefs/pref_service.h" #include "base/prefs/public/pref_change_registrar.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc index 8a1f498..52924df 100644 --- a/chrome/browser/extensions/context_menu_matcher.cc +++ b/chrome/browser/extensions/context_menu_matcher.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/common/context_menu_params.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/image/image.h" namespace extensions { diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 2ccfc4a..ffb5126 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -21,7 +21,6 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/version.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/browser/extensions/convert_web_app.h" #include "chrome/browser/extensions/extension_error_reporter.h" @@ -33,7 +32,6 @@ #include "chrome/browser/extensions/requirements_checker.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/shell_integration.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index c838c67..dce2ea3 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -3,8 +3,6 @@ // found in the LICENSE file. #include "chrome/browser/download/download_crx_util.h" -#include "chrome/browser/download/download_service.h" -#include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_install_prompt.h" @@ -20,6 +18,7 @@ #include "chrome/common/extensions/feature_switch.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/test/base/ui_test_utils.h" +#include "content/public/browser/download_manager.h" #include "content/public/test/download_test_observer.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/dom_actions.cc b/chrome/browser/extensions/dom_actions.cc index 3b769ca..2d3b6f4 100644 --- a/chrome/browser/extensions/dom_actions.cc +++ b/chrome/browser/extensions/dom_actions.cc @@ -6,6 +6,7 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/dom_actions.h" +#include "chrome/browser/history/url_database.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; @@ -130,4 +131,3 @@ DOMAction::DOMActionType DOMAction::StringAsDOMActionType( } } // namespace extensions - diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index 899847e..942a84d 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -24,6 +24,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia_source.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index dee9968..04e7dba 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -28,8 +28,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/extensions/native_app_window.h" -#include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 5045e95..272dbc5 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/process_util.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/extensions/extension_error_ui_default.cc b/chrome/browser/extensions/extension_error_ui_default.cc index 476184c..fd7cb43 100644 --- a/chrome/browser/extensions/extension_error_ui_default.cc +++ b/chrome/browser/extensions/extension_error_ui_default.cc @@ -9,7 +9,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" -#include "chrome/browser/ui/host_desktop.h" ExtensionErrorUIDefault::ExtensionErrorUIDefault( ExtensionService* extension_service) diff --git a/chrome/browser/extensions/extension_function.cc b/chrome/browser/extensions/extension_function.cc index c1b2148..4d69c99 100644 --- a/chrome/browser/extensions/extension_function.cc +++ b/chrome/browser/extensions/extension_function.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/window_controller_list.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" +#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index dd1d218..ff367bb 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -19,7 +19,6 @@ #include "build/build_config.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/icons/icons_handler.h" #include "chrome/common/extensions/background_info.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 301bcd7..c6fd20a 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -27,8 +27,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" -#include "chrome/browser/accessibility/accessibility_extension_api.h" -#include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" @@ -65,7 +63,6 @@ #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/extensions/updater/extension_updater.h" -#include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -94,7 +91,6 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/devtools_agent_host.h" -#include "content/public/browser/devtools_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/plugin_service.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index bc8ea9e..401bf11 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -54,7 +54,6 @@ #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/plugins/plugin_prefs_factory.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc index 9cbf46b..19b8696 100644 --- a/chrome/browser/extensions/extension_system_factory.cc +++ b/chrome/browser/extensions/extension_system_factory.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" -#include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" @@ -37,7 +36,6 @@ ExtensionSystemSharedFactory::ExtensionSystemSharedFactory() #if defined(ENABLE_THEMES) DependsOn(ThemeServiceFactory::GetInstance()); #endif - DependsOn(TemplateURLServiceFactory::GetInstance()); } ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() { diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 16a9acf..c02ef51 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index fb18f91..905ff3c 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -5,7 +5,6 @@ #include "chrome/browser/extensions/extension_warning_set.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_process.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 2455de0..ee83f66 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -19,8 +19,6 @@ #include "chrome/browser/prefs/pref_registry_syncable.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/icons/icons_handler.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/lazy_background_task_queue.cc b/chrome/browser/extensions/lazy_background_task_queue.cc index da9054a..6354cfd 100644 --- a/chrome/browser/extensions/lazy_background_task_queue.cc +++ b/chrome/browser/extensions/lazy_background_task_queue.cc @@ -9,10 +9,8 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/process_map.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/background_info.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index 410ca61..8e9cf54 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 81f234a..1accae4 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/utf_string_conversions.h" -#include "chrome/browser/automation/automation_util.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 5cb0be8..4e27bcc 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -99,7 +99,7 @@ void GetDownloadFilePath( base::FilePath directory(g_download_directory_for_tests ? *g_download_directory_for_tests : download_directory); -#if defined (OS_CHROMEOS) +#if defined(OS_CHROMEOS) // Do not use drive for extension downloads. if (drive::util::IsUnderDriveMountPoint(directory)) directory = download_util::GetDefaultDownloadDirectory(); @@ -256,7 +256,7 @@ void WebstoreInstaller::Observe(int type, return; // TODO(rdevlin.cronin): Continue removing std::string errors and - // replacing with string16 + // replacing with string16. See crbug.com/71980. const string16* error = content::Details<const string16>(details).ptr(); const std::string utf8_error = UTF16ToUTF8(*error); if (download_url_ == crx_installer->original_download_url()) diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 1a48cca..0a3c8cb 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_iterator.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm index b3f60d7..3a6f38a 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm @@ -29,6 +29,7 @@ #include "content/public/browser/web_contents.h" #include "skia/ext/skia_utils_mac.h" #include "ui/gfx/canvas_skia_paint.h" +#include "ui/gfx/image/image.h" using content::WebContents; using extensions::Extension; diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 8085c14..f5723ae 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -26,7 +26,6 @@ #include "chrome/browser/ui/simple_message_box.h" #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index d7dc1b3..baccb1f 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -25,7 +25,6 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" -#include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/extension_action/action_info.h" diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc index 70a7e5b..5311cc3 100644 --- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc +++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc @@ -27,6 +27,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/events/event.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/image/image.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" |