chrome/browser/extensions/page_action_controller.h - Issue 10544185: Order the script badges in the location bar consistently

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/page_action_controller.h

Issue 10544185: Order the script badges in the location bar consistently (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: revert scoped_ptr change, rebase Created 8 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:

Index: chrome/browser/extensions/page_action_controller.h

diff --git a/chrome/browser/extensions/page_action_controller.h b/chrome/browser/extensions/page_action_controller.h

index 6346e73781b04e9ae39bc5ef51718419c6e5c2f1..e0f983b3a2c34ac15564d02c49300902e4ee5188 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;