| Index: chrome/browser/extensions/api/debugger/debugger_api.cc
|
| diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
|
| index b0ad14b977535ad6f3d61b0d1550461c95c03666..06fd12fd1157a95671e1f79d47b11b950d7cbd35 100644
|
| --- a/chrome/browser/extensions/api/debugger/debugger_api.cc
|
| +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
|
| @@ -36,6 +36,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chrome/common/pref_names.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/infobars/core/confirm_infobar_delegate.h"
|
| #include "components/infobars/core/infobar.h"
|
| @@ -53,6 +54,7 @@
|
| #include "extensions/browser/extension_host.h"
|
| #include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_registry_observer.h"
|
| +#include "extensions/browser/extension_system.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/error_utils.h"
|
| #include "extensions/common/extension.h"
|
| @@ -341,13 +343,24 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
|
| // Attach to debugger and tell it we are ready.
|
| agent_host_->AttachClient(this);
|
|
|
| - if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| ::switches::kSilentDebuggerExtensionAPI)) {
|
| - infobar_ = ExtensionDevToolsInfoBar::Create(
|
| - extension_id, extension_name, this,
|
| - base::Bind(&ExtensionDevToolsClientHost::InfoBarDismissed,
|
| - base::Unretained(this)));
|
| + return;
|
| }
|
| +
|
| + if (profile->GetPrefs()->GetBoolean(
|
| + prefs::kDevToolsSilentManagedDebuggerAPIEnabled)) {
|
| + const Extension* extension =
|
| + ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(
|
| + extension_id);
|
| + if (Manifest::IsPolicyLocation(extension->location()))
|
| + return;
|
| + }
|
| +
|
| + infobar_ = ExtensionDevToolsInfoBar::Create(
|
| + extension_id, extension_name, this,
|
| + base::Bind(&ExtensionDevToolsClientHost::InfoBarDismissed,
|
| + base::Unretained(this)));
|
| }
|
|
|
| ExtensionDevToolsClientHost::~ExtensionDevToolsClientHost() {
|
|
|