summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/cocoa/extensions/browser_action_button.mm3
-rw-r--r--chrome/browser/cocoa/location_bar_view_mac.h4
-rw-r--r--chrome/browser/cocoa/location_bar_view_mac.mm4
-rw-r--r--chrome/browser/extensions/image_loading_tracker.cc2
-rw-r--r--chrome/browser/extensions/image_loading_tracker.h10
-rw-r--r--chrome/browser/gtk/browser_actions_toolbar_gtk.cc3
-rw-r--r--chrome/browser/gtk/location_bar_view_gtk.cc4
-rw-r--r--chrome/browser/gtk/location_bar_view_gtk.h3
-rw-r--r--chrome/browser/views/browser_actions_container.cc3
-rw-r--r--chrome/browser/views/browser_actions_container.h3
-rw-r--r--chrome/browser/views/location_bar_view.cc4
-rw-r--r--chrome/browser/views/location_bar_view.h3
12 files changed, 29 insertions, 17 deletions
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm
index ab497e6..faa01e9 100644
--- a/chrome/browser/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/cocoa/extensions/browser_action_button.mm
@@ -62,7 +62,8 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
}
// ImageLoadingTracker::Observer implementation.
- void OnImageLoaded(SkBitmap* image, size_t index) {
+ void OnImageLoaded(ImageLoadingTracker* source, SkBitmap* image,
+ size_t index) {
if (image)
[owner_ setDefaultIcon:gfx::SkBitmapToNSImage(*image)];
tracker_ = NULL;
diff --git a/chrome/browser/cocoa/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar_view_mac.h
index 393acf3..ad9ca8e 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.h
+++ b/chrome/browser/cocoa/location_bar_view_mac.h
@@ -241,7 +241,9 @@ class LocationBarViewMac : public AutocompleteEditController,
virtual void OnMousePressed(NSRect bounds);
// Overridden from ImageLoadingTracker.
- virtual void OnImageLoaded(SkBitmap* image, size_t index);
+ virtual void OnImageLoaded(ImageLoadingTracker* source,
+ SkBitmap* image,
+ size_t index);
// Called to notify the Page Action that it should determine whether to be
// visible or hidden. |contents| is the TabContents that is active, |url|
diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm
index affcdfab..8604b0b 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar_view_mac.mm
@@ -689,8 +689,8 @@ void LocationBarViewMac::PageActionImageView::OnMousePressed(NSRect bounds) {
}
}
-void LocationBarViewMac::PageActionImageView::OnImageLoaded(SkBitmap* image,
- size_t index) {
+void LocationBarViewMac::PageActionImageView::OnImageLoaded(
+ ImageLoadingTracker* source, SkBitmap* image, size_t index) {
// We loaded icons()->size() icons, plus one extra if the Page Action had
// a default icon.
int total_icons = page_action_->icon_paths()->size();
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index a6eafca..35b736d 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -109,7 +109,7 @@ void ImageLoadingTracker::PostLoadImageTask(const ExtensionResource& resource,
void ImageLoadingTracker::OnImageLoaded(SkBitmap* image, size_t index) {
if (observer_)
- observer_->OnImageLoaded(image, index);
+ observer_->OnImageLoaded(this, image, index);
if (image)
delete image;
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index 23f7b71..c908bab 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -21,18 +21,22 @@ class Size;
// Consider abstracting out a FilePathProvider (ExtensionResource) and moving
// back to chrome/browser/ if other subsystems want to use it.
class ImageLoadingTracker
- : public base::RefCountedThreadSafe<ImageLoadingTracker> {
+ : public base::RefCountedThreadSafe<ImageLoadingTracker> {
public:
class Observer {
public:
// Will be called when the image with the given index has loaded.
// The |image| is owned by the tracker, so the observer should make a copy
// if they need to access it after this call.
- virtual void OnImageLoaded(SkBitmap* image, size_t index) = 0;
+ virtual void OnImageLoaded(ImageLoadingTracker* source,
+ SkBitmap* image,
+ size_t index) = 0;
};
ImageLoadingTracker(Observer* observer, size_t image_count)
- : observer_(observer), image_count_(image_count), posted_count_(0) {
+ : observer_(observer),
+ image_count_(image_count),
+ posted_count_(0) {
AddRef(); // We hold on to a reference to ourself to make sure we don't
// get deleted until we get a response from image loading (see
// ImageLoadingDone).
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
index 16836bf..7ccaca7a 100644
--- a/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.cc
@@ -132,7 +132,8 @@ class BrowserActionButton : public NotificationObserver,
}
// ImageLoadingTracker::Observer implementation.
- void OnImageLoaded(SkBitmap* image, size_t index) {
+ void OnImageLoaded(ImageLoadingTracker* source, SkBitmap* image,
+ size_t index) {
if (image) {
default_skbitmap_ = *image;
default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index 925f89c..fa03e29 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -1161,8 +1161,8 @@ void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility(
}
}
-void LocationBarViewGtk::PageActionViewGtk::OnImageLoaded(SkBitmap* image,
- size_t index) {
+void LocationBarViewGtk::PageActionViewGtk::OnImageLoaded(
+ ImageLoadingTracker* source, SkBitmap* image, size_t index) {
// We loaded icons()->size() icons, plus one extra if the page action had
// a default icon.
size_t total_icons = page_action_->icon_paths()->size();
diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index 2037a2e..6c92981 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -193,7 +193,8 @@ class LocationBarViewGtk : public AutocompleteEditController,
void UpdateVisibility(TabContents* contents, GURL url);
// A callback from ImageLoadingTracker for when the image has loaded.
- virtual void OnImageLoaded(SkBitmap* image, size_t index);
+ virtual void OnImageLoaded(ImageLoadingTracker* source, SkBitmap* image,
+ size_t index);
// Simulate left mouse click on the page action button.
void TestActivatePageAction();
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index 3998cd2..acf06c2 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -140,7 +140,8 @@ void BrowserActionButton::ButtonPressed(views::Button* sender,
panel_->OnBrowserActionExecuted(this, false); // inspect_with_devtools
}
-void BrowserActionButton::OnImageLoaded(SkBitmap* image, size_t index) {
+void BrowserActionButton::OnImageLoaded(ImageLoadingTracker* source,
+ SkBitmap* image, size_t index) {
if (image)
default_icon_ = *image;
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index 6e38ab0b..cb73ccb 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -69,7 +69,8 @@ class BrowserActionButton : public views::MenuButton,
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
// Overridden from ImageLoadingTracker.
- virtual void OnImageLoaded(SkBitmap* image, size_t index);
+ virtual void OnImageLoaded(ImageLoadingTracker* source, SkBitmap* image,
+ size_t index);
// Overridden from NotificationObserver:
virtual void Observe(NotificationType type,
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 31f61e4..368a870 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -1561,8 +1561,8 @@ void LocationBarView::PageActionImageView::ShowInfoBubble() {
ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
}
-void LocationBarView::PageActionImageView::OnImageLoaded(SkBitmap* image,
- size_t index) {
+void LocationBarView::PageActionImageView::OnImageLoaded(
+ ImageLoadingTracker* source, SkBitmap* image, size_t index) {
// We loaded icons()->size() icons, plus one extra if the page action had
// a default icon.
size_t total_icons = page_action_->icon_paths()->size();
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 505492b..1cac844 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -439,7 +439,8 @@ class LocationBarView : public LocationBar,
virtual void ShowInfoBubble();
// Overridden from ImageLoadingTracker.
- virtual void OnImageLoaded(SkBitmap* image, size_t index);
+ virtual void OnImageLoaded(ImageLoadingTracker* source, SkBitmap* image,
+ size_t index);
// Overridden from ExtensionContextMenuModelModel::Delegate
virtual void InspectPopup(ExtensionAction* action);
generated by cgit v1.1 at 2025-02-08 20:33:41 +0000