chrome/browser/ui/webui/conflicts_ui.cc - Issue 2098713003: Moved a bunch of win-specific files to the new win folder in chrome/browser

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 2098713003: Moved a bunch of win-specific files to the new win folder in chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 6 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 9779632156aee2c63274be3a7845e27024c010e2..d1e0e1d06fe87529c11e8634fa453835ede4bed4 100644

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

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

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

#include "base/values.h"

#include "build/build_config.h"

#include "chrome/browser/chrome_notification_types.h"

-#include "chrome/browser/enumerate_modules_model_win.h"

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

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

#include "chrome/common/url_constants.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

« no previous file with comments | « chrome/browser/ui/webui/about_ui.cc ('k') | chrome/browser/win/OWNERS » ('j') | no next file with comments »