ui/base/resource/resource_bundle.cc - Issue 530623002: Use qualified path for three more grit headers from ui.

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: ui/base/resource/resource_bundle.cc

Issue 530623002: Use qualified path for three more grit headers from ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ui_resources too Created 6 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: ui/base/resource/resource_bundle.cc

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc

index d7e7411ca007971457bb57d53ba033987c1a87aa..98667a2608fd4197531a2005455d4485d644982e 100644

--- a/ui/base/resource/resource_bundle.cc

+++ b/ui/base/resource/resource_bundle.cc

@@ -20,7 +20,6 @@

#include "base/strings/utf_string_conversions.h"

#include "base/synchronization/lock.h"

#include "build/build_config.h"

-#include "grit/app_locale_settings.h"

#include "skia/ext/image_operations.h"

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

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

@@ -35,6 +34,7 @@

#include "ui/gfx/safe_integer_conversions.h"

#include "ui/gfx/screen.h"

#include "ui/gfx/size_conversions.h"

+#include "ui/strings/grit/app_locale_settings.h"

#if defined(OS_ANDROID)

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

« no previous file with comments | « ui/base/l10n/l10n_util_win.cc ('k') | ui/base/webui/jstemplate_builder.cc » ('j') | no next file with comments »