athena/main/placeholder.cc - Issue 508283003: Fix resources grit paths.

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: athena/main/placeholder.cc

Issue 508283003: Fix resources grit paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 4 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: athena/main/placeholder.cc

diff --git a/athena/main/placeholder.cc b/athena/main/placeholder.cc

index ba93ce87142ef6894382832d705b090c2400e060..f14cb6219d8d33d4153771a3ae6e2b5d94ada345 100644

--- a/athena/main/placeholder.cc

+++ b/athena/main/placeholder.cc

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

#include "athena/activity/public/activity_factory.h"

#include "athena/activity/public/activity_manager.h"

+#include "athena/resources/grit/athena_resources.h"

#include "athena/screen/public/screen_manager.h"

-#include "grit/athena_resources.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image_skia.h"

« no previous file with comments | « athena/main/DEPS ('k') | athena/resources/DEPS » ('j') | no next file with comments »