chrome/browser/ui/views/toolbar/browser_actions_container.h - Issue 431173002: Create ExtensionActionView class

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/ui/views/toolbar/browser_actions_container.h

Issue 431173002: Create ExtensionActionView class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge conflict Created 6 years, 4 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/ui/views/toolbar/browser_actions_container.h

diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h

index 2027765dcc73e02f62d44c5896774df63faab039..49fe9a8e9b84c22d52f55595f9f881f324b11e11 100644

--- a/chrome/browser/ui/views/toolbar/browser_actions_container.h

+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h

@@ -230,14 +230,13 @@ class BrowserActionsContainer

BrowserActionOverflowMenuController* controller) OVERRIDE;

// Overridden from BrowserActionView::Delegate:

- virtual int GetCurrentTabId() const OVERRIDE;

+ virtual content::WebContents* GetCurrentWebContents() OVERRIDE;

virtual void OnBrowserActionVisibilityChanged() OVERRIDE;

virtual bool ShownInsideMenu() const OVERRIDE;

virtual void OnBrowserActionViewDragDone() OVERRIDE;

virtual views::View* GetOverflowReferenceView() OVERRIDE;

virtual void SetPopupOwner(BrowserActionButton* popup_owner) OVERRIDE;

virtual void HideActivePopup() OVERRIDE;

- virtual extensions::ExtensionToolbarModel* GetModel() OVERRIDE;

// Overridden from extension::ExtensionKeybindingRegistry::Delegate:

virtual extensions::ActiveTabPermissionGranter*