chrome/browser/supervised_user/supervised_user_navigation_observer.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_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: chrome/browser/supervised_user/supervised_user_navigation_observer.cc

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

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:

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

Download patch

« no previous file with comments | « chrome/browser/supervised_user/supervised_user_interstitial.cc ('k') | chrome/browser/supervised_user/supervised_user_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_navigation_observer.cc

diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

index 288f940fa90ee7ad15e64fa748134876d78da874..1e186b673b1772e5fea986433c5b5fbfe863fa58 100644

--- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

+++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc

@@ -19,6 +19,7 @@

#include "chrome/browser/supervised_user/supervised_user_service_factory.h"

#include "chrome/browser/supervised_user/supervised_user_url_filter.h"

#include "chrome/browser/tab_contents/tab_util.h"

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

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

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

#include "content/public/browser/browser_thread.h"

@@ -26,7 +27,6 @@

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/user_metrics.h"

-#include "grit/generated_resources.h"

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

#if !defined(OS_ANDROID)