Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wootz third web wallet #110

Open
wants to merge 4 commits into
base: chromium
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 7 additions & 7 deletions src/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Aldo Culquicondor <alculquicondor@gmail.com>
Alec Petridis <alecthechop@gmail.com>
Aleksandar Stojiljkovic <aleksandar.stojiljkovic@intel.com>
Aleksei Gurianov <gurianov@gmail.com>
Aleksey Khoroshilov <akhoroshilov@brave.com>
Aleksey Khoroshilov <akhoroshilov@wootz.com>
Alesandro Ortiz <alesandro@alesandroortiz.com>
Alessandro Astone <ales.astone@gmail.com>
Alex Chronopoulos <achronop@gmail.com>
Expand Down Expand Up @@ -208,7 +208,7 @@ Brendan Kirby <brendan.kirby@imgtec.com>
Brendan Long <self@brendanlong.com>
Brendon Tiszka <btiszka@gmail.com>
Brett Lewis <brettlewis@brettlewis.us>
Brian Clifton <clifton@brave.com>
Brian Clifton <clifton@wootz.com>
Brian Dunn <brian@theophil.us>
Brian G. Merrell <bgmerrell@gmail.com>
Brian Konzman, SJ <b.g.konzman@gmail.com>
Expand Down Expand Up @@ -433,7 +433,7 @@ Finbar Crago <finbar.crago@gmail.com>
François Beaufort <beaufort.francois@gmail.com>
François Devatine <devatine@verizonmedia.com>
Francois Kritzinger <francoisk777@gmail.com>
Francois Marier <francois@brave.com>
Francois Marier <francois@wootz.com>
Francois Rauch <leopardb@gmail.com>
Frankie Dintino <fdintino@theatlantic.com>
Franklin Ta <fta2012@gmail.com>
Expand Down Expand Up @@ -929,7 +929,7 @@ Matthieu Rigolot <matthieu.rigolot@gmail.com>
Matthieu Vlad Hauglustaine <matt.hauglustaine@gmail.com>
Mattias Buelens <mattias.buelens@gmail.com>
Max Coplan <mchcopl@gmail.com>
Max Karolinskiy <max@brave.com>
Max Karolinskiy <max@wootz.com>
Max Perepelitsyn <pph34r@gmail.com>
Max Schmitt <max@schmitt.mx>
Max Vujovic <mvujovic@adobe.com>
Expand Down Expand Up @@ -965,7 +965,7 @@ Mihai Tica <mitica@adobe.com>
Mike Pennisi <mike@mikepennisi.com>
Mike Tilburg <mtilburg@adobe.com>
Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
Mikhail Atuchin <matuchin@brave.com>
Mikhail Atuchin <matuchin@wootz.com>
Milko Leporis <milko.leporis@imgtec.com>
Milton Chiang <milton.chiang@mediatek.com>
Milutin Smiljanic <msmiljanic.gm@gmail.com>
Expand Down Expand Up @@ -1106,7 +1106,7 @@ Po-Chun Chang <pochang0403@gmail.com>
Prakhar Shrivastav <p.shri@samsung.com>
Pramod Begur Srinath <pramod.bs@samsung.com>
Pranay Kumar <pranay.kumar@samsung.com>
Pranjal Jumde <pranjal@brave.com>
Pranjal Jumde <pranjal@wootz.com>
Prashant Hiremath <prashhir@cisco.com>
Prashant Nevase <prashant.n@samsung.com>
Prashant Patil <prashant.patil@imgtec.com>
Expand All @@ -1133,7 +1133,7 @@ Rahul Gupta <rahul.g@samsung.com>
Rahul Yadav <rahul.yadav@samsung.com>
Rajesh Mahindra <rmahindra@uber.com>
Rajneesh Rana <rajneesh.r@samsung.com>
Ralph Giles <rgiles@brave.com>
Ralph Giles <rgiles@wootz.com>
Raman Tenneti <raman.tenneti@gmail.com>
Ramkumar Gokarnesan <ramkumar.gokarnesan@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com>
Expand Down
22 changes: 11 additions & 11 deletions src/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ deps = {
},

'src/chrome/browser/resources/preinstalled_web_apps/internal': {
'url': Var('chrome_git') + '/chrome/components/default_apps.git' + '@' + '3ca47d00648c126561056443c2c5f401c02eda9d',
'url': Var('chrome_git') + '/components/default_apps.git' + '@' + '3ca47d00648c126561056443c2c5f401c02eda9d',
'condition': 'checkout_src_internal',
},

Expand Down Expand Up @@ -4326,60 +4326,60 @@ deps = {
},

'src/components/autofill/core/browser/form_parsing/internal_resources': {
'url': Var('chrome_git') + '/chrome/components/autofill_regex_patterns.git' + '@' +
'url': Var('chrome_git') + '/components/autofill_regex_patterns.git' + '@' +
'feb267b80dd9df83ce4949470d5b1cc6214cd775',
'condition': 'checkout_src_internal',
},

'src/components/crash/core/app/internal': {
'url': Var('chrome_git') + '/chrome/components/crash.git' + '@' + '977755983e64eb91813875407050afcc7c1b6683',
'url': Var('chrome_git') + '/components/crash.git' + '@' + '977755983e64eb91813875407050afcc7c1b6683',
'condition': 'checkout_src_internal',
},

'src/components/metrics/internal': {
'url': Var('chrome_git') + '/chrome/components/metrics/internal.git' + '@' +
'url': Var('chrome_git') + '/components/metrics/internal.git' + '@' +
'ac51808a082f35a97395ebb49c74dca809bd7540',
'condition': 'checkout_src_internal',
},

'src/components/ntp_tiles/resources/internal': {
'url': Var('chrome_git') + '/chrome/components/ntp_tiles/resources.git' + '@' +
'url': Var('chrome_git') + '/components/ntp_tiles/resources.git' + '@' +
'48c257ae331a9c642af38b8f62cb2c789e2a7da6',
'condition': 'checkout_src_internal',
},

'src/components/optimization_guide/internal': {
'url': Var('chrome_git') + '/chrome/components/optimization_guide.git' + '@' +
'url': Var('chrome_git') + '/components/optimization_guide.git' + '@' +
'5015c9cb9b8a8b5bd5dcfd6cbaa7b41e1d2af2d7',
'condition': 'checkout_src_internal',
},

'src/components/plus_addresses/resources/internal': {
'url': Var('chrome_git') + '/chrome/components/plus_addresses/resources.git' + '@' +
'url': Var('chrome_git') + '/components/plus_addresses/resources.git' + '@' +
'4f595c87a18088bf7c43613ebae849f23559f725',
'condition': 'checkout_src_internal',
},

'src/components/resources/default_100_percent/google_chrome': {
'url': Var('chrome_git') + '/chrome/components/default_100_percent/google_chrome.git' + '@' +
'url': Var('chrome_git') + '/components/default_100_percent/google_chrome.git' + '@' +
'de2513c741f9caf5889b1300ea3e51ce3efc88b8',
'condition': 'checkout_src_internal',
},

'src/components/resources/default_200_percent/google_chrome': {
'url': Var('chrome_git') + '/chrome/components/default_200_percent/google_chrome.git' + '@' +
'url': Var('chrome_git') + '/components/default_200_percent/google_chrome.git' + '@' +
'515db2e8d702f1b0d2c7a3fa3140a338d306102c',
'condition': 'checkout_src_internal',
},

'src/components/resources/default_300_percent/google_chrome': {
'url': Var('chrome_git') + '/chrome/components/default_300_percent/google_chrome.git' + '@' +
'url': Var('chrome_git') + '/components/default_300_percent/google_chrome.git' + '@' +
'79dd350d2fee765ea02f603fc2ca140f20debb86',
'condition': 'checkout_src_internal',
},

'src/components/site_isolation/internal': {
'url': Var('chrome_git') + '/chrome/components/site_isolation.git' + '@' +
'url': Var('chrome_git') + '/components/site_isolation.git' + '@' +
'e0d8a7769c1daabb974bf0d229970534a0aede77',
'condition': 'checkout_src_internal',
},
Expand Down
5 changes: 5 additions & 0 deletions src/android_webview/browser/aw_permission_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,11 @@ void AwPermissionManager::CancelPermissionRequest(int request_id) {
case PermissionType::NFC:
case PermissionType::VR:
case PermissionType::AR:
case PermissionType::WOOTZ_ETHEREUM:
case PermissionType::WOOTZ_SOLANA:
// case PermissionType::WOOTZ_GOOGLE_SIGN_IN:
// case PermissionType::WOOTZ_LOCALHOST_ACCESS:

case PermissionType::STORAGE_ACCESS_GRANT:
case PermissionType::TOP_LEVEL_STORAGE_ACCESS:
case PermissionType::CAMERA_PAN_TILT_ZOOM:
Expand Down
3 changes: 2 additions & 1 deletion src/base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ if (is_fuchsia) {
# TODO(crbug.com/40811643): Drop toolchain_has_rust and move the C++ parser into
# components/nacl to just run in-process there. Don't compile base::JSONReader
# on NaCL at all.
build_rust_json_reader = toolchain_has_rust && enable_rust_json
build_rust_json_reader = true

# Rust to C++ type conversions. Also can not be enabled while NaCl depends on
# //base.
Expand Down Expand Up @@ -4491,6 +4491,7 @@ if (is_android) {
"android/java/src/org/chromium/base/BuildInfo.java",
"android/java/src/org/chromium/base/BundleUtils.java",
"android/java/src/org/chromium/base/Callback.java",
"android/java/src/org/chromium/base/Callbacks.java",
"android/java/src/org/chromium/base/CallbackController.java",
"android/java/src/org/chromium/base/CollectionUtil.java",
"android/java/src/org/chromium/base/CommandLine.java",
Expand Down
Loading
Loading