diff options
author | Rahul Chaturvedi <rkc@chromium.org> | 2014-08-27 14:34:21 -0700 |
---|---|---|
committer | Rahul Chaturvedi <rkc@chromium.org> | 2014-08-27 21:37:25 +0000 |
commit | 447e14fe56fbbcb57a4b195ec8345c5da2afad48 (patch) | |
tree | 222bb01f4fcd0115d91420794b3202aa3eac64ec | |
parent | 14cc3e825bd5a7c451d45f21e5642dd0aa43bcbf (diff) | |
download | chromium_src-447e14fe56fbbcb57a4b195ec8345c5da2afad48.zip chromium_src-447e14fe56fbbcb57a4b195ec8345c5da2afad48.tar.gz chromium_src-447e14fe56fbbcb57a4b195ec8345c5da2afad48.tar.bz2 |
Remove ledger code from Chrome.
Since the code from the ledger* internal repos has now been open-sourced, we should get rid of this code from Chrome.
R=isherman@chromium.org, kalman@chromium.org, thakis@chromium.org
BUG=None.
Review URL: https://codereview.chromium.org/510893003
Cr-Commit-Position: refs/heads/master@{#292231}
-rw-r--r-- | chrome/browser/browser_resources.grd | 1 | ||||
-rw-r--r-- | chrome/browser/resources/component_extension_resources.grd | 8 | ||||
-rw-r--r-- | chrome/chrome_browser_extensions.gypi | 5 | ||||
-rw-r--r-- | chrome/common/chrome_switches.cc | 8 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
-rw-r--r-- | chrome/common/extensions/api/_api_features.json | 4 | ||||
-rw-r--r-- | chrome/common/extensions/api/_permission_features.json | 17 | ||||
-rw-r--r-- | chrome/common/extensions/api/schemas.gni | 3 | ||||
-rw-r--r-- | chrome/common/extensions/api/schemas.gypi | 8 | ||||
-rw-r--r-- | chrome/common/extensions/permissions/chrome_api_permissions.cc | 1 | ||||
-rw-r--r-- | chrome/common/extensions/permissions/permission_set_unittest.cc | 1 | ||||
-rw-r--r-- | extensions/browser/extension_function_histogram_value.h | 2 | ||||
-rw-r--r-- | extensions/common/permissions/api_permission.h | 1 | ||||
-rw-r--r-- | tools/metrics/histograms/histograms.xml | 2 |
14 files changed, 2 insertions, 61 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index dfa0843..5e0519a2 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -360,7 +360,6 @@ <include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_app\manifest.json" type="BINDATA" /> <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quickoffice\manifest.json" type="BINDATA" /> - <include name="IDR_LEDGER_PROXY_MANIFEST" file="extensions\api\ledger\ledger_proxy\manifest.json" type="BINDATA" /> </if> <if expr="chromeos"> <include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type="BINDATA" /> diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd index 0ca0867..ae8fdf6 100644 --- a/chrome/browser/resources/component_extension_resources.grd +++ b/chrome/browser/resources/component_extension_resources.grd @@ -179,14 +179,6 @@ <include name="IDR_CRYPTOTOKEN_GSTATICORIGINCHECK_JS" file="cryptotoken/gstaticorigincheck.js" type="BINDATA" /> <include name="IDR_CRYPTOTOKEN_ORIGINCHECK_JS" file="cryptotoken/origincheck.js" type="BINDATA" /> <include name="IDR_CRYPTOTOKEN_CRYPTOTOKENBACKGROUND_JS" file="cryptotoken/cryptotokenbackground.js" type="BINDATA" /> - <if expr="chromeos and _google_chrome"> - <include name="IDR_LEDGER_BACKGROUND_HTML" file="../extensions/api/ledger/ledger_proxy/background.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_LEDGER_INIT_JS" file="../extensions/api/ledger/ledger_proxy/js/init.js" type="BINDATA" /> - <include name="IDR_LEDGER_NACL_JS" file="../extensions/api/ledger/ledger_proxy/js/nacl.js" type="BINDATA" /> - <include name="IDR_LEDGER_WRAPPER_JS" file="../extensions/api/ledger/ledger_proxy/js/wrapper.js" type="BINDATA" /> - <include name="IDR_LEDGER_LEDGER_PROXY_NMF" file="../extensions/api/ledger/ledger_proxy/ledger_proxy.nmf.js" type="BINDATA" /> - <include name="IDR_LEDGER_LEDGER_PROXY_PEXE" file="../extensions/api/ledger/ledger_proxy/ledger_proxy_pnacl.pexe.js" type="BINDATA" /> - </if> <include name="IDR_WHISPERNET_PROXY_BACKGROUND_HTML" file="whispernet_proxy/background.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_WHISPERNET_PROXY_INIT_JS" file="whispernet_proxy/js/init.js" type="BINDATA" /> <include name="IDR_WHISPERNET_PROXY_NACL_JS" file="whispernet_proxy/js/nacl.js" type="BINDATA" /> diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index a111c54..16befea 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -1045,11 +1045,6 @@ 'browser/extensions/api/tabs/ash_panel_contents.h', ], }], - ['branding=="Chrome" and chromeos==1', { - 'dependencies': [ - 'browser/extensions/api/ledger/ledger.gyp:ledger_api', - ], - }], ['use_aura==1', { 'dependencies': [ '../ui/keyboard/keyboard.gyp:keyboard', diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 1b24991..61a9447 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -771,14 +771,6 @@ const char kKioskMode[] = "kiosk"; // See http://crbug.com/31395. const char kKioskModePrinting[] = "kiosk-printing"; -// Address for the ledger (Copresence) server. -// Ledger is deprecated; use the chrome.copresence API instead. -const char kLedgerServer[] = "ledger-server"; - -// Tracing token for calls to the ledger (Copresence) server. -// Ledger is deprecated; use the chrome.copresence API instead. -const char kLedgerTracingToken[] = "ledger-tracing-token"; - // Causes Chrome to attempt to get metadata from the webstore for the // given item, and then prompt the user to download and install it. const char kLimitedInstallFromWebstore[] = "limited-install-from-webstore"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index d47c678..d8af127 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -218,8 +218,6 @@ extern const char kIpcFuzzerTestcase[]; extern const char kKeepAliveForTest[]; extern const char kKioskMode[]; extern const char kKioskModePrinting[]; -extern const char kLedgerServer[]; -extern const char kLedgerTracingToken[]; extern const char kLimitedInstallFromWebstore[]; extern const char kLoadComponentExtension[]; extern const char kLoadExtension[]; diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json index 453d272..d31b137 100644 --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json @@ -523,10 +523,6 @@ "dependencies": ["permission:inputMethodPrivate"], "contexts": ["blessed_extension"] }, - "ledger": { - "dependencies": ["permission:ledger"], - "contexts": ["blessed_extension"] - }, "location": { "dependencies": ["permission:location"], "contexts": ["blessed_extension"] diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index 3749464..4f5bf00 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json @@ -607,23 +607,6 @@ "extension_types": ["extension", "legacy_packaged_app", "platform_app"], "location": "component" }], - "ledger": { - "channel": "trunk", - "extension_types": ["extension", "platform_app"], - "platforms": ["chromeos"], - "whitelist": [ - "AFA728615D3A82D4017BDECEE86978543194D198", // http://crbug.com/387999 - "0C0426C12F94156F330FFAF346A976BA8878DE78", // http://crbug.com/387999 - "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/389230 - "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/389230 - "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB", // http://crbug.com/389230 - "307E96539209F95A1A8740C713E6998A73657D96", // http://crbug.com/389230 - "4F25792AF1AA7483936DE29C07806F203C7170A0", // http://crbug.com/407693 - "BD8781D757D830FC2E85470A1B6E8A718B7EE0D9", // http://crbug.com/407693 - "4AC2B6C63C6480D150DFDA13E4A5956EB1D0DDBB", // http://crbug.com/407693 - "81986D4F846CEDDDB962643FA501D1780DD441BB" // http://crbug.com/407693 - ] - }, "location": [ { "channel": "dev", diff --git a/chrome/common/extensions/api/schemas.gni b/chrome/common/extensions/api/schemas.gni index 452c1df..a8a8b41 100644 --- a/chrome/common/extensions/api/schemas.gni +++ b/chrome/common/extensions/api/schemas.gni @@ -18,9 +18,6 @@ if (is_android) { sources = gypi_values.main_schema_files if (is_chromeos) { sources += gypi_values.chromeos_schema_files - if (is_chrome_branded) { - sources += gypi_values.chromeos_branded_schema_files - } } if (enable_webrtc) { sources += gypi_values.webrtc_schema_files diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi index 41134e9..b7b9d17 100644 --- a/chrome/common/extensions/api/schemas.gypi +++ b/chrome/common/extensions/api/schemas.gypi @@ -142,9 +142,6 @@ 'wallpaper_private.json', 'webcam_private.idl', ], - 'chromeos_branded_schema_files': [ - 'ledger/ledger.idl', - ], 'webrtc_schema_files': [ 'cast_streaming_rtp_stream.idl', @@ -181,11 +178,6 @@ '<@(webrtc_schema_files)', ], }], - ['branding=="Chrome" and chromeos==1', { - 'schema_files': [ - '<@(chromeos_branded_schema_files)', - ], - }], ], 'cc_dir': 'chrome/common/extensions/api', 'root_namespace': 'extensions::api::%(namespace)s', diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index 4a90623..9baa41b 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -125,7 +125,6 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions() {APIPermission::kInfobars, "infobars"}, {APIPermission::kInput, "input", APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_INPUT, PermissionMessage::kInput}, - {APIPermission::kLedger, "ledger"}, {APIPermission::kLocation, "location", APIPermissionInfo::kFlagCannotBeOptional, IDS_EXTENSION_PROMPT_WARNING_GEOLOCATION, diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index 4cb09a1..2a824ec7 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -657,7 +657,6 @@ TEST(PermissionsTest, PermissionMessages) { skip.insert(APIPermission::kGcm); skip.insert(APIPermission::kIdle); skip.insert(APIPermission::kIdltest); - skip.insert(APIPermission::kLedger); skip.insert(APIPermission::kLogPrivate); skip.insert(APIPermission::kNotifications); skip.insert(APIPermission::kNotificationProvider); diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h index 197d04e..35d9887 100644 --- a/extensions/browser/extension_function_histogram_value.h +++ b/extensions/browser/extension_function_histogram_value.h @@ -820,7 +820,7 @@ enum HistogramValue { HOTWORDPRIVATE_NOTIFYHOTWORDRECOGNITION, FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDSUCCESS, DELETED_FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDERROR, - LEDGER_BATCHEXECUTE, + DELETED_LEDGER_BATCHEXECUTE, DELETED_FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDSUCCESS, DELETED_FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDERROR, DELETED_FILESYSTEMPROVIDERINTERNAL_CLOSEFILEREQUESTEDSUCCESS, diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h index 2ee17f7..a3045f0 100644 --- a/extensions/common/permissions/api_permission.h +++ b/extensions/common/permissions/api_permission.h @@ -115,7 +115,6 @@ class APIPermission { kInfobars, kInput, kInputMethodPrivate, - kLedger, kLocation, kLogPrivate, kManagement, diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 6c8b879..bd13782 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -40890,7 +40890,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. label="FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDSUCCESS"/> <int value="761" label="DELETED_FILESYSTEMPROVIDERINTERNAL_READDIRECTORYREQUESTEDERROR"/> - <int value="762" label="LEDGER_BATCHEXECUTE"/> + <int value="762" label="DELETED_LEDGER_BATCHEXECUTE"/> <int value="763" label="DELETED_FILESYSTEMPROVIDERINTERNAL_OPENFILEREQUESTEDSUCCESS"/> <int value="764" |