chrome/browser/webui/conflicts_ui.cc - Issue 6532069: Reland "WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5."

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

Issue 6532069: Reland "WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 10 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/webui/conflicts_ui.cc

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

index 1e041bb29deb70573aa0a87b66797d2277c59474..73afb4de910fdffedfadf334f17c798bea6885aa 100644

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

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

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

#include "base/string_number_conversions.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"

#include "chrome/browser/enumerate_modules_model_win.h"

#include "chrome/browser/metrics/user_metrics.h"

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

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

+#include "chrome/browser/webui/chrome_url_data_manager.h"

#include "chrome/common/jstemplate_builder.h"

#include "chrome/common/notification_observer.h"

#include "chrome/common/notification_registrar.h"

« no previous file with comments | « chrome/browser/webui/chrome_url_data_manager_backend.cc ('k') | chrome/browser/webui/constrained_html_ui.h » ('j') | no next file with comments »