Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: chrome/browser/views/location_bar_view.h

Issue 149046: PageActions can now specify multiple icons and switch between them... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.cc ('k') | chrome/browser/views/location_bar_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/location_bar_view.h
===================================================================
--- chrome/browser/views/location_bar_view.h (revision 19579)
+++ chrome/browser/views/location_bar_view.h (working copy)
@@ -332,7 +332,7 @@
void UpdateVisibility(TabContents* contents, GURL url);
// A callback for when the image has loaded.
- void OnImageLoaded(SkBitmap* image);
+ void OnImageLoaded(SkBitmap* image, size_t index);
private:
// We load the images for the PageActions on the file thread. These tasks
@@ -350,6 +350,9 @@
// us, it resides in the extension of this particular profile.
const PageAction* page_action_;
+ // The icons representing different states for the page action.
+ std::vector<SkBitmap> page_action_icons_;
+
// The object that is waiting for the image loading to complete
// asynchronously.
ImageLoadingTracker* tracker_;
@@ -360,6 +363,9 @@
// The URL we are currently showing the icon for.
GURL current_url_;
+ // The string to show for a tooltip;
+ std::string tooltip_;
+
DISALLOW_COPY_AND_ASSIGN(PageActionImageView);
};
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.cc ('k') | chrome/browser/views/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698