chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc - Issue 11786003: Move Icons out of Extension 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/location_bar/page_action_with_badge_view.cc

Issue 11786003: Move Icons out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 10 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/infobars/extension_infobar.cc ('k') | chrome/browser/ui/views/script_bubble_view.cc » ('j') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc

diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc

index 33e37c7750a9fc6282a9bb46ce9255ba0fa32dfc..c5d4671229edf839610814441341e7fa44bcb2f0 100644

--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc

+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"

#include "chrome/browser/ui/views/location_bar/page_action_image_view.h"

+#include "chrome/common/extensions/api/icons/icons_handler.h"

#include "chrome/common/extensions/extension.h"

#include "ui/base/accessibility/accessible_view_state.h"

@@ -23,8 +24,8 @@ void PageActionWithBadgeView::GetAccessibleState(

}

gfx::Size PageActionWithBadgeView::GetPreferredSize() {

- return gfx::Size(extensions::Extension::kPageActionIconMaxSize,

- extensions::Extension::kPageActionIconMaxSize);

+ return gfx::Size(extensions::IconsInfo::kPageActionIconMaxSize,

+ extensions::IconsInfo::kPageActionIconMaxSize);

}

int PageActionWithBadgeView::GetBuiltInHorizontalPadding() const {