chrome/browser/chrome_content_browser_client.cc - Issue 65123002: Move chrome/common/extensions/background_info.h to src/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_content_browser_client.cc

Issue 65123002: Move chrome/common/extensions/background_info.h to src/extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase2 background_info Created 7 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

« no previous file with comments | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/chromeos/file_manager/file_browser_handlers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

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

index f12cd1ed5c9a7113bae3df4ecb46f57101d08602..f8ab17f190e43d8b026558ab738c02e1f2a1420e 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -94,7 +94,6 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/env_vars.h"

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

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

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

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

@@ -132,6 +131,7 @@

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

#include "extensions/browser/view_type_utils.h"

#include "extensions/common/constants.h"

+#include "extensions/common/manifest_handlers/background_info.h"

#include "extensions/common/switches.h"

#include "grit/generated_resources.h"

#include "grit/ui_resources.h"

@@ -1501,11 +1501,11 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(

autofill::switches::kEnableInteractiveAutocomplete,

autofill::switches::kEnablePasswordGeneration,

autofill::switches::kNoAutofillNecessaryForPasswordGeneration,

+ extensions::switches::kAllowHTTPBackgroundPage,

extensions::switches::kAllowLegacyExtensionManifests,

extensions::switches::kAllowScriptingGallery,

extensions::switches::kEnableExperimentalExtensionApis,

extensions::switches::kExtensionsOnChromeURLs,

- switches::kAllowHTTPBackgroundPage,

// TODO(victorhsieh): remove the following flag once we move PPAPI FileIO

// to browser.

switches::kAllowNaClFileHandleAPI,

@@ -1545,9 +1545,9 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(

arraysize(kSwitchNames));

} else if (process_type == switches::kUtilityProcess) {

static const char* const kSwitchNames[] = {

+ extensions::switches::kAllowHTTPBackgroundPage,

extensions::switches::kEnableExperimentalExtensionApis,

extensions::switches::kExtensionsOnChromeURLs,

- switches::kAllowHTTPBackgroundPage,

switches::kWhitelistedExtensionID,

};