| Index: chrome/browser/extensions/dev_mode_bubble_controller.cc
|
| diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc
|
| index d6914e503a83524f100fc598604e207161009ae6..cb3ed16ac6b891b04351f3990a5a93ef9ea5714b 100644
|
| --- a/chrome/browser/extensions/dev_mode_bubble_controller.cc
|
| +++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc
|
| @@ -12,12 +12,10 @@
|
| #include "chrome/browser/extensions/extension_toolbar_model.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| -#include "chrome/common/chrome_version_info.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/extension_system.h"
|
| -#include "extensions/common/feature_switch.h"
|
| #include "grit/components_strings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -77,7 +75,8 @@ bool DevModeBubbleDelegate::ShouldIncludeExtension(
|
| const Extension* extension = service_->GetExtensionById(extension_id, false);
|
| if (!extension)
|
| return false;
|
| - return DevModeBubbleController::IsDevModeExtension(extension);
|
| + return (extension->location() == Manifest::UNPACKED ||
|
| + extension->location() == Manifest::COMMAND_LINE);
|
| }
|
|
|
| void DevModeBubbleDelegate::AcknowledgeExtension(
|
| @@ -154,17 +153,6 @@ void DevModeBubbleController::ClearProfileListForTesting() {
|
| g_shown_for_profiles.Get().clear();
|
| }
|
|
|
| -// static
|
| -bool DevModeBubbleController::IsDevModeExtension(
|
| - const Extension* extension) {
|
| - if (!FeatureSwitch::force_dev_mode_highlighting()->IsEnabled()) {
|
| - if (chrome::VersionInfo::GetChannel() < chrome::VersionInfo::CHANNEL_BETA)
|
| - return false;
|
| - }
|
| - return extension->location() == Manifest::UNPACKED ||
|
| - extension->location() == Manifest::COMMAND_LINE;
|
| -}
|
| -
|
| DevModeBubbleController::DevModeBubbleController(Profile* profile)
|
| : ExtensionMessageBubbleController(new DevModeBubbleDelegate(profile),
|
| profile),
|
|
|