chrome/browser/notifications/desktop_notification_infobar_delegate.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/notifications/desktop_notification_infobar_delegate.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: 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/nacl_host/nacl_infobar_delegate.cc ('k') | chrome/browser/notifications/extension_welcome_notification.cc » ('j') | chrome/browser/password_manager/password_manager_util_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notification_infobar_delegate.cc

diff --git a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc

index b00a5c320af86baf718be35da814abc0edcdbcf2..036211ca2f56411666410edf4bb0b4e9ada9a080 100644

--- a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc

+++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc

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

#include "chrome/browser/content_settings/permission_queue_controller.h"

#include "chrome/browser/content_settings/permission_request_id.h"

#include "chrome/browser/infobars/infobar_service.h"

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

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

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

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

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

-#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

#include "grit/theme_resources.h"

#include "net/base/net_util.h"