chrome/browser/extensions/extension_service.cc - Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into

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/extensions/extension_service.cc

Issue 11312228: Move extension_error_utils.* and url_pattern_set.* into (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: hate Created 8 years, 1 month 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/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc

index b959e39b3bcd583a456932df67ad109e8e3c0f62..3bcb590062b2b318652e06600df2d9b0ed44efe6 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

@@ -40,8 +40,8 @@

#include "chrome/browser/extensions/api/management/management_api.h"

#include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h"

#include "chrome/browser/extensions/api/preference/preference_api.h"

-#include "chrome/browser/extensions/api/runtime/runtime_api.h"

#include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"

+#include "chrome/browser/extensions/api/runtime/runtime_api.h"

#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"

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

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

@@ -93,13 +93,12 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/extensions/extension.h"

-#include "chrome/common/extensions/extension_error_utils.h"

#include "chrome/common/extensions/extension_file_util.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

#include "chrome/common/extensions/extension_messages.h"

#include "chrome/common/extensions/extension_resource.h"

-#include "chrome/common/extensions/features/feature.h"

#include "chrome/common/extensions/feature_switch.h"

+#include "chrome/common/extensions/features/feature.h"

#include "chrome/common/extensions/manifest.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

@@ -111,6 +110,7 @@

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

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

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

+#include "extensions/common/error_utils.h"

#include "googleurl/src/gurl.h"

#include "grit/generated_resources.h"

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

« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »