chrome/browser/automation/testing_automation_provider.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/automation/testing_automation_provider.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 | « chrome/browser/automation/automation_provider_observers.cc ('k') | chrome/browser/background/background_application_list_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/automation/testing_automation_provider.cc

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc

index 2a15219996eeb2b8c07ac7e4cad340d03caf2499..739a295c3b95bd7dd9c001e6f164cebfff24b966 100644

--- a/chrome/browser/automation/testing_automation_provider.cc

+++ b/chrome/browser/automation/testing_automation_provider.cc

@@ -187,6 +187,7 @@ using content::WebContents;

using extensions::Extension;

using extensions::ExtensionActionManager;

using extensions::ExtensionList;

+using extensions::Manifest;

namespace {

@@ -3704,14 +3705,14 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,

extension_value->Set("effective_host_permissions",

GetHostPermissions(extension, true));

extension_value->Set("api_permissions", GetAPIPermissions(extension));

- Extension::Location location = extension->location();

+ Manifest::Location location = extension->location();

extension_value->SetBoolean("is_component",

- location == Extension::COMPONENT);

+ location == Manifest::COMPONENT);

extension_value->SetBoolean("is_internal",

- location == Extension::INTERNAL);

+ location == Manifest::INTERNAL);

extension_value->SetBoolean("is_user_installed",

- location == Extension::INTERNAL ||

- location == Extension::LOAD);

+ location == Manifest::INTERNAL ||

+ location == Manifest::LOAD);

extension_value->SetBoolean("is_enabled", service->IsExtensionEnabled(id));

extension_value->SetBoolean("allowed_in_incognito",

service->IsIncognitoEnabled(id));