chrome/browser/ui/webui/conflicts_ui.cc - Issue 2276823003: Change many chrome/browser includes to use qualified paths.

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/webui/conflicts_ui.cc

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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/ui/webui/conflicts_ui.cc

diff --git a/chrome/browser/ui/webui/conflicts_ui.cc b/chrome/browser/ui/webui/conflicts_ui.cc

index d1e0e1d06fe87529c11e8634fa453835ede4bed4..e4166b6af9c7495ed594f87c007eb2109566257e 100644

--- a/chrome/browser/ui/webui/conflicts_ui.cc

+++ b/chrome/browser/ui/webui/conflicts_ui.cc

@@ -20,8 +20,11 @@

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

#include "chrome/browser/win/enumerate_modules_model.h"

#include "chrome/common/url_constants.h"

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

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

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

+#include "components/strings/grit/components_strings.h"

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

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

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

@@ -30,9 +33,6 @@

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

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

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

-#include "grit/browser_resources.h"

-#include "grit/components_strings.h"

-#include "grit/theme_resources.h"

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

#include "ui/base/layout.h"

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

« chrome/browser/DEPS ('K') | « chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chrome/browser/ui/webui/crashes_ui.cc » ('j') | no next file with comments »