Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8508)

Unified Diff: chrome/renderer/extensions/dispatcher.cc

Issue 136473004: Move kExtensionProcess to src/extensions/common/switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix app_shell (switches) Created 6 years, 11 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
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | extensions/common/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index 98af97c65ca42c6f3fd51ada3fda3a25ecc406b5..6b55b5a5ea7a4403b327f4a55a7366229e3b936e 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -82,6 +82,7 @@
#include "extensions/common/manifest_handlers/sandboxed_page_info.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
+#include "extensions/common/switches.h"
#include "extensions/common/view_type.h"
#include "grit/common_resources.h"
#include "grit/renderer_resources.h"
@@ -460,8 +461,8 @@ Dispatcher::Dispatcher()
v8_schema_registry_(new V8SchemaRegistry) {
const CommandLine& command_line = *(CommandLine::ForCurrentProcess());
is_extension_process_ =
- command_line.HasSwitch(switches::kExtensionProcess) ||
- command_line.HasSwitch(switches::kSingleProcess);
+ command_line.HasSwitch(extensions::switches::kExtensionProcess) ||
+ command_line.HasSwitch(::switches::kSingleProcess);
if (is_extension_process_) {
RenderThread::Get()->SetIdleNotificationDelayInMs(
@@ -1179,7 +1180,7 @@ void Dispatcher::DidCreateScriptContext(
is_within_platform_app &&
GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV &&
CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableAppWindowControls)) {
+ ::switches::kEnableAppWindowControls)) {
module_system->Require("windowControls");
}
@@ -1221,7 +1222,8 @@ void Dispatcher::DidCreateScriptContext(
// Same comment as above for <adview> tag.
if (context_type == Feature::BLESSED_EXTENSION_CONTEXT &&
is_within_platform_app) {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAdview)) {
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kEnableAdview)) {
if (extension->HasAPIPermission(APIPermission::kAdView)) {
module_system->Require("adView");
} else {
@@ -1474,7 +1476,7 @@ void Dispatcher::OnUpdateUserScripts(
void Dispatcher::UpdateActiveExtensions() {
// In single-process mode, the browser process reports the active extensions.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
+ if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kSingleProcess))
return;
std::set<std::string> active_extensions = active_extension_ids_;
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | extensions/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698