diff options
23 files changed, 41 insertions, 16 deletions
diff --git a/app/menus/button_menu_item_model.h b/app/menus/button_menu_item_model.h index 640642a..6292904 100644 --- a/app/menus/button_menu_item_model.h +++ b/app/menus/button_menu_item_model.h @@ -8,7 +8,6 @@ #include <vector> #include "base/string16.h" -#include "third_party/skia/include/core/SkBitmap.h" namespace menus { diff --git a/app/menus/simple_menu_model.h b/app/menus/simple_menu_model.h index b6ae852..34031c9 100644 --- a/app/menus/simple_menu_model.h +++ b/app/menus/simple_menu_model.h @@ -8,12 +8,13 @@ #include <vector> #include "base/string16.h" -#include "app/menus/button_menu_item_model.h" #include "app/menus/menu_model.h" #include "third_party/skia/include/core/SkBitmap.h" namespace menus { +class ButtonMenuItemModel; + // A simple MenuModel implementation with an imperative API for adding menu // items. This makes it easy to construct fixed menus. Menus populated by // dynamic data sources may be better off implementing MenuModel directly. diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 5fdce54..efca124 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -74,6 +74,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/ssl/ssl_blocking_page.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/automation_constants.h" diff --git a/chrome/browser/cocoa/infobar_container_controller.mm b/chrome/browser/cocoa/infobar_container_controller.mm index 174c76b..2f8b751 100644 --- a/chrome/browser/cocoa/infobar_container_controller.mm +++ b/chrome/browser/cocoa/infobar_container_controller.mm @@ -9,6 +9,7 @@ #import "chrome/browser/cocoa/infobar_container_controller.h" #import "chrome/browser/cocoa/infobar_controller.h" #include "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/cocoa/infobar_controller.mm b/chrome/browser/cocoa/infobar_controller.mm index c73511d..cd7d14d 100644 --- a/chrome/browser/cocoa/infobar_controller.mm +++ b/chrome/browser/cocoa/infobar_controller.mm @@ -12,6 +12,7 @@ #include "chrome/browser/cocoa/infobar.h" #import "chrome/browser/cocoa/infobar_container_controller.h" #import "chrome/browser/cocoa/infobar_controller.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 72f37b5..7420eef 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/geolocation/mock_location_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc index ba5ca61..b31608a 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/geolocation/mock_location_provider.h" #include "chrome/browser/renderer_host/mock_render_process_host.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h index 6ee0336..74dcd8d 100644 --- a/chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/gtk/create_application_shortcuts_dialog_gtk.h @@ -12,7 +12,6 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/shell_integration.h" #include "googleurl/src/gurl.h" -#include "third_party/skia/include/core/SkBitmap.h" typedef struct _GtkWidget GtkWidget; typedef struct _GtkWindow GtkWindow; diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index fd7b21c..3fee8da 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -16,6 +16,7 @@ #include "gfx/gtk_util.h" #include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" +#include "third_party/skia/include/core/SkBitmap.h" CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider, int normal_id, int active_id, int highlight_id, int depressed_id, diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h index 8a4ed6a7d..7c79e42 100644 --- a/chrome/browser/gtk/custom_button.h +++ b/chrome/browser/gtk/custom_button.h @@ -15,10 +15,11 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/owned_widget_gtk.h" #include "gfx/rect.h" -#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkColor.h" class CairoCachedSurface; class GtkThemeProvider; +class SkBitmap; // These classes implement two kinds of custom-drawn buttons. They're // used on the toolbar and the bookmarks bar. diff --git a/chrome/browser/gtk/tab_contents_drag_source.h b/chrome/browser/gtk/tab_contents_drag_source.h index a885fed..20eeea3 100644 --- a/chrome/browser/gtk/tab_contents_drag_source.h +++ b/chrome/browser/gtk/tab_contents_drag_source.h @@ -16,9 +16,9 @@ #include "gfx/point.h" #include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h" +class SkBitmap; class TabContents; class TabContentsView; struct WebDropData; diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 9c32297..10c8d7c 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -28,6 +28,7 @@ #if defined(TOOLKIT_GTK) #include "chrome/browser/gtk/gtk_theme_provider.h" #endif +#include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_service.h" #include "grit/browser_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 963ed7b..8a29653 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -1345,6 +1345,10 @@ void TabContents::OnCloseStarted() { tab_close_start_time_ = base::TimeTicks::Now(); } +void TabContents::set_request_context(URLRequestContextGetter* context) { + request_context_ = context; +} + bool TabContents::ShouldAcceptDragAndDrop() const { #if defined(OS_CHROMEOS) // ChromeOS panels (pop-ups) do not take drag-n-drop. diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index f636734..a96a790 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -28,7 +28,6 @@ #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/constrained_window.h" -#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/language_state.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" @@ -73,6 +72,7 @@ class DOMUI; class DownloadItem; class Extension; class GeolocationSettingsState; +class InfoBarDelegate; class LoadNotificationDetails; class OmniboxSearchHint; class PluginInstaller; @@ -644,9 +644,7 @@ class TabContents : public PageNavigator, void OnCloseStarted(); // Getter/Setters for the url request context to be used for this tab. - void set_request_context(URLRequestContextGetter* context) { - request_context_ = context; - } + void set_request_context(URLRequestContextGetter* context); URLRequestContextGetter* request_context() const { return request_context_.get(); } diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.cc b/chrome/browser/tab_contents/tab_specific_content_settings.cc index 21aaa3f..fe175f5 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.cc +++ b/chrome/browser/tab_contents/tab_specific_content_settings.cc @@ -5,6 +5,10 @@ #include "chrome/browser/tab_contents/tab_specific_content_settings.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/browsing_data_appcache_helper.h" +#include "chrome/browser/browsing_data_database_helper.h" +#include "chrome/browser/browsing_data_local_storage_helper.h" +#include "net/base/cookie_monster.h" bool TabSpecificContentSettings::IsContentBlocked( ContentSettingsType content_type) const { @@ -130,6 +134,10 @@ TabSpecificContentSettings::LocalSharedObjectsContainer:: local_storages_(new CannedBrowsingDataLocalStorageHelper(profile)) { } +TabSpecificContentSettings::LocalSharedObjectsContainer:: + ~LocalSharedObjectsContainer() { +} + void TabSpecificContentSettings::LocalSharedObjectsContainer::Reset() { cookies_->DeleteAll(false); appcaches_->Reset(); diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.h b/chrome/browser/tab_contents/tab_specific_content_settings.h index 648841e..18f78d8 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.h +++ b/chrome/browser/tab_contents/tab_specific_content_settings.h @@ -6,18 +6,21 @@ #define CHROME_BROWSER_TAB_CONTENTS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ #include "base/basictypes.h" -#include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browsing_data_database_helper.h" -#include "chrome/browser/browsing_data_local_storage_helper.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "net/base/cookie_monster.h" +class CannedBrowsingDataAppCacheHelper; +class CannedBrowsingDataDatabaseHelper; +class CannedBrowsingDataLocalStorageHelper; class Profile; +namespace net { +class CookieMonster; +} + class TabSpecificContentSettings : public RenderViewHostDelegate::ContentSettings { public: @@ -74,6 +77,7 @@ class TabSpecificContentSettings class LocalSharedObjectsContainer { public: explicit LocalSharedObjectsContainer(Profile* profile); + ~LocalSharedObjectsContainer(); // Empties the container. void Reset(); diff --git a/chrome/browser/tab_contents/test_tab_contents.cc b/chrome/browser/tab_contents/test_tab_contents.cc index f0c7405..9e1cad0 100644 --- a/chrome/browser/tab_contents/test_tab_contents.cc +++ b/chrome/browser/tab_contents/test_tab_contents.cc @@ -6,6 +6,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" +#include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/notification_service.h" TestTabContents::TestTabContents(Profile* profile, SiteInstance* instance) diff --git a/chrome/browser/utility_process_host.h b/chrome/browser/utility_process_host.h index 122d5a0..c21f5e5 100644 --- a/chrome/browser/utility_process_host.h +++ b/chrome/browser/utility_process_host.h @@ -15,11 +15,11 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/common/extensions/update_manifest.h" #include "ipc/ipc_channel.h" -#include "third_party/skia/include/core/SkBitmap.h" class CommandLine; class DictionaryValue; class ListValue; +class SkBitmap; // This class acts as the browser-side host to a utility child process. A // utility process is a short-lived sandboxed process that is created to run diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h index e9cb1b1..c7f6604 100644 --- a/chrome/browser/wrench_menu_model.h +++ b/chrome/browser/wrench_menu_model.h @@ -8,6 +8,7 @@ #include <set> #include <vector> +#include "app/menus/button_menu_item_model.h" #include "app/menus/simple_menu_model.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" diff --git a/chrome/renderer/pepper_devices.cc b/chrome/renderer/pepper_devices.cc index 99f1275..e140727 100644 --- a/chrome/renderer/pepper_devices.cc +++ b/chrome/renderer/pepper_devices.cc @@ -8,6 +8,7 @@ #include "skia/ext/platform_canvas.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/plugins/webplugin.h" +#include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/chrome/renderer/pepper_devices.h b/chrome/renderer/pepper_devices.h index 596b35f..f66dd4a 100644 --- a/chrome/renderer/pepper_devices.h +++ b/chrome/renderer/pepper_devices.h @@ -15,9 +15,9 @@ #include "gfx/rect.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npapi_extensions.h" -#include "third_party/skia/include/core/SkBitmap.h" class WebPluginDelegatePepper; +class SkBitmap; // Lists all contexts currently open for painting. These are ones requested by // the plugin but not destroyed by it yet. The source pointer is the raw diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 713eda8..1386917 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -76,6 +76,7 @@ #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/image_operations.h" #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityCache.h" #include "third_party/WebKit/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index e2c8387..ea515b4 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -44,7 +44,6 @@ #include "chrome/renderer/translate_helper.h" #include "gfx/point.h" #include "gfx/rect.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h" #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h" @@ -82,6 +81,7 @@ class ListValue; class NavigationState; class PepperDeviceTest; class PrintWebViewHelper; +class SkBitmap; class WebPluginDelegatePepper; class WebPluginDelegateProxy; struct ContextMenuMediaParams; |