diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 20:13:24 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-20 20:13:24 +0000 |
| commit | 7668bfe1f7605715c9d72568fde4de5e66534915 (patch) | |
| tree | e90e0aff89ad26a21a13656ddfa97f572c0c8395 /chrome/browser/views/location_bar_view.h | |
| parent | 95dd38fd658dd0eef530b3171b641f4a8bf5a224 (diff) | |
| download | chromium_src-7668bfe1f7605715c9d72568fde4de5e66534915.zip chromium_src-7668bfe1f7605715c9d72568fde4de5e66534915.tar.gz chromium_src-7668bfe1f7605715c9d72568fde4de5e66534915.tar.bz2 | |
Revert "Revert 29457, because this is making ExtensionBrowserTest.PageAction crash on Vista"
Original description:
Implement badges for page actions. Also add badge text color API.
Also change color APIs from wanting ARGB to RGBA.
BUG=24635
BUG=24644
BUG=25215
Review URL: http://codereview.chromium.org/293031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/location_bar_view.h')
| -rw-r--r-- | chrome/browser/views/location_bar_view.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index fb8b249..6290a99 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -356,6 +356,7 @@ class LocationBarView : public LocationBar, // Overridden from LocationBarImageView. virtual void ShowInfoBubble(); + virtual void Paint(gfx::Canvas* canvas); // Overridden from ImageLoadingTracker. virtual void OnImageLoaded(SkBitmap* image, size_t index); @@ -394,6 +395,7 @@ class LocationBarView : public LocationBar, DISALLOW_COPY_AND_ASSIGN(PageActionImageView); }; + friend class PageActionImageView; // Both Layout and OnChanged call into this. This updates the contents // of the 3 views: selected_keyword, keyword_hint and type_search_view. If |