| Index: chrome/browser/automation/automation_provider_observers.cc
|
| diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
|
| index 004398b83ce77ef6e2ffbf014b1638d34a51ec04..254859517d78e74516826d4312e50240bbb21a75 100644
|
| --- a/chrome/browser/automation/automation_provider_observers.cc
|
| +++ b/chrome/browser/automation/automation_provider_observers.cc
|
| @@ -68,6 +68,7 @@
|
| #include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/common/content_settings_types.h"
|
| #include "chrome/common/extensions/extension.h"
|
| +#include "chrome/common/extensions/manifest.h"
|
| #include "chrome/common/view_type.h"
|
| #include "content/public/browser/dom_operation_notification_details.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| @@ -630,9 +631,9 @@ void ExtensionReadyNotificationObserver::Observe(
|
| const extensions::Extension* loaded_extension =
|
| content::Details<const extensions::Extension>(details).ptr();
|
| // Only track an internal or unpacked extension load.
|
| - extensions::Extension::Location location = loaded_extension->location();
|
| - if (location != extensions::Extension::INTERNAL &&
|
| - location != extensions::Extension::LOAD)
|
| + extensions::Manifest::Location location = loaded_extension->location();
|
| + if (location != extensions::Manifest::INTERNAL &&
|
| + location != extensions::Manifest::LOAD)
|
| return;
|
| extension_ = loaded_extension;
|
| if (!DidExtensionViewsStopLoading(manager_))
|
| @@ -1875,7 +1876,7 @@ std::vector<DictionaryValue*>* GetAppInfoFromExtensions(
|
| DictionaryValue* app_info = new DictionaryValue();
|
| AppLauncherHandler::CreateAppInfo(*ext, NULL, ext_service, app_info);
|
| app_info->SetBoolean("is_component_extension",
|
| - (*ext)->location() == extensions::Extension::COMPONENT);
|
| + (*ext)->location() == extensions::Manifest::COMPONENT);
|
|
|
| // Convert the launch_type integer into a more descriptive string.
|
| int launch_type;
|
|
|