chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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/android/content_settings/popup_blocked_infobar_delegate.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/android/chrome_http_auth_handler.cc ('k') | chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

index eaa0103fcada521a58e8ed5f3bb485595c86a58f..9c3a3d6d13271b188c1fd9199b822a0f758521fe 100644

--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

@@ -10,9 +10,9 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"

#include "chrome/common/content_settings.h"

+#include "chrome/grit/generated_resources.h"

#include "components/content_settings/core/common/content_settings_types.h"

#include "components/infobars/core/infobar.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

tommycli 2014/08/22 20:35:30 It's expected that these other grit includes don't

Lei Zhang 2014/08/22 20:52:21 We're doing them one file at a time.

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