chrome/browser/ui/cocoa/location_bar/star_decoration.mm - Issue 6849030: Add support for multi resolution icons

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/cocoa/location_bar/star_decoration.mm

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed resource ID conflict with devtools Created 9 years, 8 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/cocoa/location_bar/star_decoration.mm

diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm

index 5ae432e4ae579c73e572a96089bd0c6f2a68b37b..c3e1d48afd695a50f0ea0fa86fd528233d140b26 100644

--- a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm

+++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm

@@ -9,6 +9,7 @@

#include "chrome/browser/command_updater.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

+#include "grit/theme_resources_standard.h"

#include "ui/base/l10n/l10n_util_mac.h"

namespace {