chrome/browser/browsing_data/cookies_tree_model.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/browsing_data/cookies_tree_model.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

Index: chrome/browser/browsing_data/cookies_tree_model.cc

diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc

index c2e91d74f60ea65a37d2a4d72c4842f512d8c4ad..e988668c69ab1b1c37b120d2e8854d892daf2e49 100644

--- a/chrome/browser/browsing_data/cookies_tree_model.cc

+++ b/chrome/browser/browsing_data/cookies_tree_model.cc

@@ -17,8 +17,8 @@

#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"

#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"

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

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

#include "content/public/common/url_constants.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "net/cookies/canonical_cookie.h"

« no previous file with comments | « chrome/browser/background/background_mode_manager_win.cc ('k') | chrome/browser/certificate_manager_model.cc » ('j') | no next file with comments »