chrome/browser/ui/views/browser_actions_container.cc - 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/views/browser_actions_container.cc

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/views/browser_actions_container.cc

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

index 3fd12be1af396bc83df9cf3c61fadb7aa54940cd..942d92db4f2afef301ad70930bd1c6f8c1a03c95 100644

--- a/chrome/browser/ui/views/browser_actions_container.cc

+++ b/chrome/browser/ui/views/browser_actions_container.cc

@@ -29,6 +29,8 @@

#include "content/common/notification_type.h"

#include "grit/app_resources.h"

#include "grit/generated_resources.h"

+#include "grit/theme_resources.h"

+#include "grit/theme_resources_standard.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/skia/include/effects/SkGradientShader.h"

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

@@ -45,8 +47,6 @@

#include "views/metrics.h"

#include "views/window/window.h"

-#include "grit/theme_resources.h"

// Horizontal spacing between most items in the container, as well as after the

// last item or chevron (if visible).

static const int kItemSpacing = ToolbarView::kStandardSpacing;