chrome/browser/chrome_browser_main.cc - Issue 229733002: Toro: Move ExtensionProtocolHandler to //extensions

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/chrome_browser_main.cc

Issue 229733002: Toro: Move ExtensionProtocolHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase (extension-protocols) Created 6 years, 8 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:

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index ccccf1feaa8b6398e0b9f190727c4c7b18314fb3..9d7b9f68bc88a6fbb4055eb0e061f4ccd64f20f0 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -53,7 +53,6 @@

#include "chrome/browser/component_updater/swiftshader_component_installer.h"

#include "chrome/browser/component_updater/widevine_cdm_component_installer.h"

#include "chrome/browser/defaults.h"

-#include "chrome/browser/extensions/extension_protocols.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/startup_helper.h"

#include "chrome/browser/feedback/feedback_profile_observer.h"

@@ -128,6 +127,7 @@

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

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

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

+#include "extensions/browser/extension_protocols.h"

#include "extensions/browser/extension_system.h"

#include "grit/app_locale_settings.h"

#include "grit/browser_resources.h"