chrome/browser/ui/views/location_bar/page_action_image_view.h - Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i…

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/location_bar/page_action_image_view.h

Issue 9703099: Revert 126959 - Re-factor location bar/toolbar code to get rid of the browser dependency. This CL i… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/page_action_image_view.h

===================================================================

--- chrome/browser/ui/views/location_bar/page_action_image_view.h (revision 127082)

+++ chrome/browser/ui/views/location_bar/page_action_image_view.h (working copy)

@@ -15,7 +15,6 @@

#include "chrome/browser/ui/views/extensions/extension_popup.h"

#include "ui/views/controls/image_view.h"

-class Browser;

class LocationBarView;

namespace content {

@@ -34,8 +33,7 @@

public content::NotificationObserver {

public:

PageActionImageView(LocationBarView* owner,

- ExtensionAction* page_action,

- Browser* browser);

+ ExtensionAction* page_action);

virtual ~PageActionImageView();

ExtensionAction* page_action() { return page_action_; }

@@ -93,9 +91,6 @@

// us, it resides in the extension of this particular profile.

ExtensionAction* page_action_;

- // The corresponding browser.

- Browser* browser_;

// A cache of bitmaps the page actions might need to show, mapped by path.

typedef std::map<std::string, SkBitmap> PageActionMap;

PageActionMap page_action_icons_;