ash/launcher/launcher_button.cc - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

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: ash/launcher/launcher_button.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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

Index: ash/launcher/launcher_button.cc

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc

index e271e64e44d565b5179f2bd55107817195c43a61..a3848ab36b1e8e0dfbe15e9cfd2abccfb8011e7e 100644

--- a/ash/launcher/launcher_button.cc

+++ b/ash/launcher/launcher_button.cc

@@ -7,7 +7,7 @@

#include <algorithm>

#include "ash/launcher/launcher_button_host.h"

-#include "grit/ui_resources.h"

+#include "grit/ash_resources.h"

#include "skia/ext/image_operations.h"

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

#include "ui/base/animation/animation_delegate.h"

« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/launcher/launcher_view.cc » ('j') | no next file with comments »