diff options
author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-01 03:57:10 +0000 |
---|---|---|
committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-01 03:57:10 +0000 |
commit | ac7b5aff9ae65cdb387c557f49958ac1e388181c (patch) | |
tree | af017ea80734d7750913960d10e29372370743bc /chrome/browser/cocoa | |
parent | 3bc67d82dd6310c46b0c1e9c4d9c2af50481f4e7 (diff) | |
download | chromium_src-ac7b5aff9ae65cdb387c557f49958ac1e388181c.zip chromium_src-ac7b5aff9ae65cdb387c557f49958ac1e388181c.tar.gz chromium_src-ac7b5aff9ae65cdb387c557f49958ac1e388181c.tar.bz2 |
Implement page action popups.
A random side effect of this change is that it changes page action hover from bubble to tool tip.
BUG=24645
TEST=ExtensionApiTest.PageActionPopup
Review URL: http://codereview.chromium.org/347016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r-- | chrome/browser/cocoa/location_bar_view_mac.h | 3 | ||||
-rw-r--r-- | chrome/browser/cocoa/location_bar_view_mac.mm | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar_view_mac.h index fb08b3f..b9ff05a 100644 --- a/chrome/browser/cocoa/location_bar_view_mac.h +++ b/chrome/browser/cocoa/location_bar_view_mac.h @@ -56,6 +56,9 @@ class LocationBarViewMac : public AutocompleteEditController, // Overriden from LocationBarTesting: virtual int PageActionCount(); virtual int PageActionVisibleCount(); + virtual ExtensionAction* GetPageAction(size_t index); + virtual ExtensionAction* GetVisiblePageAction(size_t index); + virtual void TestPageActionPressed(size_t index); // Updates the location bar. Resets the bar's permanent text and // security style, and if |should_restore_state| is true, restores diff --git a/chrome/browser/cocoa/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar_view_mac.mm index 2e935cc..f74d951 100644 --- a/chrome/browser/cocoa/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar_view_mac.mm @@ -295,6 +295,20 @@ int LocationBarViewMac::PageActionVisibleCount() { return -1; } +ExtensionAction* LocationBarViewMac::GetPageAction(size_t index) { + NOTIMPLEMENTED(); + return NULL; +} + +ExtensionAction* LocationBarViewMac::GetVisiblePageAction(size_t index) { + NOTIMPLEMENTED(); + return NULL; +} + +void LocationBarViewMac::TestPageActionPressed(size_t index) { + NOTIMPLEMENTED(); +} + NSImage* LocationBarViewMac::GetTabButtonImage() { if (!tab_button_image_) { SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance(). |