diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 23:23:25 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-18 23:23:25 +0000 |
| commit | f47f04b562c7fd69dc4fd67fe6229c800e020f96 (patch) | |
| tree | 3d9a8b0019cfb38384185ec4b523463c599d3b0d /chrome/browser/extensions/page_action_controller.h | |
| parent | 08289aa79e8731fa3a58db81d72e4f34bb03a8d3 (diff) | |
| download | chromium_src-f47f04b562c7fd69dc4fd67fe6229c800e020f96.zip chromium_src-f47f04b562c7fd69dc4fd67fe6229c800e020f96.tar.gz chromium_src-f47f04b562c7fd69dc4fd67fe6229c800e020f96.tar.bz2 | |
Order the script badges in the location bar in the order that
they appeared, and fix the logic on each platform which
assumes they never change.
BUG=133139
Review URL: https://chromiumcodereview.appspot.com/10544185
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/page_action_controller.h')
| -rw-r--r-- | chrome/browser/extensions/page_action_controller.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/extensions/page_action_controller.h b/chrome/browser/extensions/page_action_controller.h index 6346e73..e0f983b 100644 --- a/chrome/browser/extensions/page_action_controller.h +++ b/chrome/browser/extensions/page_action_controller.h @@ -25,8 +25,7 @@ class PageActionController : public LocationBarController { virtual ~PageActionController(); // LocationBarController implementation. - virtual scoped_ptr<std::vector<ExtensionAction*> > GetCurrentActions() - OVERRIDE; + virtual std::vector<ExtensionAction*> GetCurrentActions() OVERRIDE; virtual Action OnClicked(const std::string& extension_id, int mouse_button) OVERRIDE; |