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

Unified Diff: chrome/browser/automation/automation_provider_observers.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698