summaryrefslogtreecommitdiffstats
path: root/chrome/tools
Commit message (Collapse)AuthorAgeFilesLines
* base: Finish moving the SplitString functions from string_util.h to ↵tfarina@chromium.org2010-09-241-1/+2
| | | | | | | | | | | string_split.h BUG=None TEST=trybos Review URL: http://codereview.chromium.org/3447008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60422 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for Breakpad r692:r697, try 3.thestig@chromium.org2010-09-231-5/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3432019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60320 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 60146 - Breakpad DEPS roll 692:697erikwright@chromium.org2010-09-221-1/+0
| | | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3386017 TBR=erikwright@chromium.org Review URL: http://codereview.chromium.org/3455013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60148 0039d316-1c4b-4281-b951-d872f2087c98
* Breakpad DEPS roll 692:697erikwright@chromium.org2010-09-221-0/+1
| | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3386017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60146 0039d316-1c4b-4281-b951-d872f2087c98
* Now that we can actually successfully nest both the setuid and the seccompmarkus@chromium.org2010-09-201-27/+51
| | | | | | | | | | | | | | | | | sandbox (not enabled by default) there are a lot more permutations of what our processes can look like. This changelist updates the chrome-process-identifier.sh script to recognize these permutations so that we can print correct data. It also fixes a bug that prevented us from identifying Chrome processes after the binary had been deleted from disk. BUG=none TEST=CHROME_DEVEL_SANDBOX=chrome-sandbox chrome-wrapper --enable-seccomp-sandbox; chrome-process-identifier.sh Review URL: http://codereview.chromium.org/3446012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59989 0039d316-1c4b-4281-b951-d872f2087c98
* The recent change for setting LD_LIBRARY_PATH doesn't actually work, as themarkus@chromium.org2010-09-151-7/+1
| | | | | | | | | | | | | | | | | script is executed by /bin/sh. On many systems, /bin/sh does not have support for "[[". We could either switch to a different shell (e.g. /bin/bash), we could switch to using "[" instead, or we could avoid the entire problem by using "${:+}" variable expansion. I tested that the latter does the right thing with /bin/bash, /bin/ash, /bin/dash, /bin/zsh, /bin/sh (the latter being a symbolic link to /bin/dash). So, I think we are on the safe side. BUG=54132 TEST=Start Chrome and notice that there no longer is an error message about "[[" being unavailable Review URL: http://codereview.chromium.org/3412004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59579 0039d316-1c4b-4281-b951-d872f2087c98
* Add more useful metrics to "Languages and Input" page in Chrome OS.satorux@chromium.org2010-09-142-0/+408
| | | | | | | | | | | | | | | | Record metrics with associated input method IDs, and language codes, to make the metrics data more useful. Update chromeactions.txt as follows: % cd chrome/tools % PYTHONPATH=../../tools/python python extract_actions.py --hash BUG=chromium-os:2637 TEST=manually. Review URL: http://codereview.chromium.org/3330021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59348 0039d316-1c4b-4281-b951-d872f2087c98
* Fix another instance of potentially dangling ":" in LD_LIBRARY_PATH.mmoss@google.com2010-09-131-1/+7
| | | | | | | | | | | This file is not packaged with Chrome, so not as likely to cause problems, but cleaning it up for completeness. BUG=54132 Review URL: http://codereview.chromium.org/3372010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59285 0039d316-1c4b-4281-b951-d872f2087c98
* Run worker processes via the zygote.agl@chromium.org2010-09-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | The following tests fail when using the SUID sandbox because they try to count processes and the extra sandbox processes throw them off. They pass with this patch so long as the SUID sandbox isn't invoked (which is the case on the builders): WorkerTest.FLAKY_MultipleTabsQueuedSharedWorker WorkerTest.FLAKY_LimitPerPage WorkerTest.WorkerClose WorkerTest.QueuedSharedWorkerShutdown WorkerTest.FLAKY_QueuedSharedWorkerStartedFromOtherTab Note that this patch doesn't trigger the seccomp sandbox for worker processes. That will have to wait for another CL. BUG=54794 TEST=ui_tests http://codereview.chromium.org/3312021/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59242 0039d316-1c4b-4281-b951-d872f2087c98
* Change UI font at startup time if necessary, based on the UI locale.satorux@chromium.org2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | As of writing, ChromeDroidSans is used as the UI font (see /etc/gtk-2.0/gtkrc). This setting does not work well for Japanese users as Chinese glyphs are used for Kanji characters. For Japanese UI, we should use a Japanese font. Introduce IDS_UI_FONT_FAMILY_CROS to control the UI font based on the UI locale. For now, app_locale_settings_ja.xtb only contains a non-default value: IPAPGothic. Just for the record, I originally tried to use "DroidSans Japanese" but for some reason, this caused space characters (0x20) to be garbled in the wrench menu. Hence, IPAPGotchic is chosen for now. TEST=manually on the netbook, and ubuntu BUG=chromium-os:4038 Review URL: http://codereview.chromium.org/3275008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58913 0039d316-1c4b-4281-b951-d872f2087c98
* Add libEGL.pdb and libGLESv2.pdb to the list of copied symbol filesjamesr@chromium.org2010-09-071-1/+3
| | | | | | | | | | | These DLLs are generated from ANGLE. The pdb's are needed to debug archived continuous builds. BUG=none TEST=Check chrome-win32-syms.zip on the builders Review URL: http://codereview.chromium.org/3310017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58743 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: include an updated copy of xdg-mime that fixes default browser ↵mdm@chromium.org2010-09-031-9/+14
| | | | | | | | | | | selection on KDE 4. This should probably wait until after we branch for M7 this week. BUG=18106,33842 TEST=default browser selection works in KDE 4 on distributions shipping CVS xdg-mime Review URL: http://codereview.chromium.org/3258009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58449 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r57812 (Add the new Mac manifest to the application bundle) and ↵gfeher@chromium.org2010-09-021-22/+0
| | | | | | | | | | | | | | | remove dummy translations Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) Also remove the old manifest file and references to translations that are not there yet. The problem with the previous landing attempt was that in Release mode build, the following script was looking for binary files that were not there: build/mac/strip_from_xcode BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences with English descriptions Review URL: http://codereview.chromium.org/3287003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58366 0039d316-1c4b-4281-b951-d872f2087c98
* Linux Reliability Bot: set the correct name for 64-bit Breakpad symbol files.thestig@chromium.org2010-08-311-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3236007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58066 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Enable symbol dumping on 64-bit Breakpad.thestig@chromium.org2010-08-311-1/+2
| | | | | | | | BUG=20737 TEST=none Review URL: http://codereview.chromium.org/3213005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58050 0039d316-1c4b-4281-b951-d872f2087c98
* Added D3DCompiler_42.dll to the installer.apatrick@chromium.org2010-08-302-0/+6
| | | | | | | | | | | This is a runtime dependency of D3DX9 which is needed to make ANGLE work on Windows. TEST=will run try when blocking CL is landed BUG=none Review URL: http://codereview.chromium.org/3134037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57920 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 57812 - Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-0/+22
| | | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences TBR=thomasvl@chromium.org Review URL: http://codereview.chromium.org/3267003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57813 0039d316-1c4b-4281-b951-d872f2087c98
* Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-22/+0
| | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences Review URL: http://codereview.chromium.org/3143036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57812 0039d316-1c4b-4281-b951-d872f2087c98
* Make the script more robust when using the zygote inside of the setuid sandbox.markus@chromium.org2010-08-261-6/+19
| | | | | | | | | | | | | | We now explicitly reject an process that has a "--type=" command line argument when scanning for the main browser process. Also, for the seccomp sandbox print the pid of the trusted process. This might be helpful information in some cases. TEST=none BUG=none Review URL: http://codereview.chromium.org/3184026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57565 0039d316-1c4b-4281-b951-d872f2087c98
* Renamed script so that it won't be reported by checkperms.markus@chromium.org2010-08-251-0/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3203007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57374 0039d316-1c4b-4281-b951-d872f2087c98
* Minor performance improvement. Use "ps" instead of "sed" to find parentmarkus@chromium.org2010-08-251-1/+2
| | | | | | | | | | | | processes. And properly mark variables as local, so that the exit code from "identify" is correct. Otherwise, we needlessly scan for more processes when returning from "identify". TEST=none BUG=none Review URL: http://codereview.chromium.org/3173046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57368 0039d316-1c4b-4281-b951-d872f2087c98
* A shell script that identifies the different Chrome processes. This scriptmarkus@chromium.org2010-08-251-0/+108
| | | | | | | | | | | | | | | | finds all the processes that belong to a given instance of Chrome and attempts to identify their types (e.g. browser, extension, plugin, zygote, renderer). It also prints out information on whether a sandbox is active and what type of sandbox has been identified. This script is likely to only work on Linux or systems that closely mimick Linux's /proc filesystem. TEST=start Chrome, invoke script, verify that it shows different process types BUG=none Review URL: http://codereview.chromium.org/3158033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57354 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land r56742 now with correct database filesbrettw@chromium.org2010-08-211-1/+1
| | | | | | | | | | | | | | | | A new field to describe the sources of history urls(visits) is added. This field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review: http://codereview.chromium.org/2906004/show Patch by weili@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56971 0039d316-1c4b-4281-b951-d872f2087c98
* Add d3dx9_42.dll, libEGL.dll, and libGLESv2.dll to the distributed builds.apatrick@chromium.org2010-08-202-0/+19
| | | | | | | | | | | | | | Landed issue 3032040 on darin@'s behalf. Original: http://codereview.chromium.org/3032040/show The issue with the introducation of a dependency on msvcr80.dll mentioned in the original issue comments is resolved. It seemed to be specific to darin's build configuration. TEST=try BUG=none Review URL: http://codereview.chromium.org/3118001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56884 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56742 - A new field to describe the sources of history urls(visits) ↵brettw@chromium.org2010-08-191-1/+1
| | | | | | | | | | | | | | | | | | | is added. This field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review=http://codereview.chromium.org/2906004/show Patch by weili@google.com TBR=brettw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56754 0039d316-1c4b-4281-b951-d872f2087c98
* A new field to describe the sources of history urls(visits) is added. This ↵brettw@chromium.org2010-08-191-1/+1
| | | | | | | | | | | | | | | | | field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review=http://codereview.chromium.org/2906004/show Patch by weili@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56742 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove "obviously" unneeded standard C++ library #includes.viettrungluu@chromium.org2010-08-151-2/+2
| | | | | | | | | BUG=none TEST=builds Review URL: http://codereview.chromium.org/3179017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56171 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing newlines in chrome/tools/build/win/FILES.apatrick@chromium.org2010-08-091-1/+1
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/3132001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55486 0039d316-1c4b-4281-b951-d872f2087c98
* Remove GetSwitchValue() from chrome/* where easy.evan@chromium.org2010-08-061-2/+2
| | | | | | Review URL: http://codereview.chromium.org/3057033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55176 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Remove GetSwitchValue() from chrome/* where easy."evan@chromium.org2010-08-041-2/+2
| | | | | | | | This reverts commit r54966. Meant to try it, not commit it, sorry everyone. :( git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54969 0039d316-1c4b-4281-b951-d872f2087c98
* Remove GetSwitchValue() from chrome/* where easy.evan@chromium.org2010-08-041-2/+2
| | | | | | Review URL: http://codereview.chromium.org/3057033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54966 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 54363 since it adds a runtime dependency on MSVCR80.dll.darin@chromium.org2010-07-302-20/+1
| | | | | | | | TBR=mal Review URL: http://codereview.chromium.org/3057026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54367 0039d316-1c4b-4281-b951-d872f2087c98
* Add d3dx9_42.dll, libEGL.dll, and libGLESv2.dll to the distributed builds.darin@chromium.org2010-07-302-1/+20
| | | | | | | | R=mal Review URL: http://codereview.chromium.org/3032040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54363 0039d316-1c4b-4281-b951-d872f2087c98
* `#pragma once` for app, base, chrome, gfx, ipc, net, skia, viewsthakis@chromium.org2010-07-264-0/+4
| | | | | | | | | BUG=50273 TEST=everything still builds, build is 10% faster on windows, same speed on mac/linux TBR: erg git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53716 0039d316-1c4b-4281-b951-d872f2087c98
* Remove <iostream> where possible.erg@google.com2010-07-201-1/+0
| | | | | | | | | | | | | <iostream> creates a static initializer. Most people don't need <iostream> anyway--they really need <ostream> for operator<< overloads. <iostream> should *never* be included in a header file; <iosfwd> exists for that purpose. BUG=none TEST=none Review URL: http://codereview.chromium.org/3014015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53083 0039d316-1c4b-4281-b951-d872f2087c98
* Stuff the MCX policy file into the app bundle where it belongs.avi@chromium.org2010-07-161-0/+22
| | | | | | | | | BUG=http://crbug.com/45334 TEST=build chromium, open the package, look in the resources folder, see either "org.chromium.Chromium.manifest" or "com.google.Chrome.manifest" (depending on the build). Open the file, see either "Chromium" or "Google Chrome" at the top (again, depending on the build). Review URL: http://codereview.chromium.org/2809057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52710 0039d316-1c4b-4281-b951-d872f2087c98
* Convert some helper tools to use FilePaths for file names.evan@chromium.org2010-07-146-25/+25
| | | | | | | | | | | | | | Add a "PRFilePath" macro to file_path.h for use in printf'ing a FilePath. These are some of the last users of deprecated file_util functions (e.g. OpenFile(wstring, ...)). BUG=24672 Review URL: http://codereview.chromium.org/2929002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52391 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build.evan@chromium.org2010-07-081-2/+4
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51864 0039d316-1c4b-4281-b951-d872f2087c98
* Deprecate most of the remaining wstring file_util functions.evan@chromium.org2010-07-082-3/+6
| | | | | | | | | | | | | These still exist on Windows due to being used by the installer, but by moving them into the Windows-only block we prevent them from being used in new code. (I am already finding new code using some of these! I am glad to be rid of them.) BUG=24672 Review URL: http://codereview.chromium.org/2850042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51862 0039d316-1c4b-4281-b951-d872f2087c98
* Add resources.pak to be included in chrome official buildseblake@chromium.org2010-06-301-0/+5
| | | | | | | | | | (ChromeOS Bug id) BUG=4405 TEST=passed linux try server Review URL: http://codereview.chromium.org/2885008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51280 0039d316-1c4b-4281-b951-d872f2087c98
* Load net-internals resources from resources.pak.tony@chromium.org2010-06-221-0/+5
| | | | | | | | | | | | | | | This is the same as r50257 with 2 fixes: 1) Copy resources.pak to <(PRODUCT_DIR) on mac so it will work for things tests. 2) Add back the check in chrome_paths.cc to see if we're in a mac bundle or not. BUG=35793,42770 TEST=none Review URL: http://codereview.chromium.org/2865010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50433 0039d316-1c4b-4281-b951-d872f2087c98
* Load resources.pak, which should be located next to the chrometony@chromium.org2010-06-152-0/+2
| | | | | | | | | | | | | | | binary. resources.pak will contain all the files we currently have in the resources subdirectory (it currently only has net-internals files). On Linux, this is an eager load (before the zygote), but on Mac and Win, this is lazily loaded as needed. This isn't being used yet, just adding the necessary plumbing for now. BUG=42770 Review URL: http://codereview.chromium.org/2755006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49772 0039d316-1c4b-4281-b951-d872f2087c98
* Update installer for internal plugin.jam@chromium.org2010-06-154-0/+14
| | | | | | Review URL: http://codereview.chromium.org/2799006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49757 0039d316-1c4b-4281-b951-d872f2087c98
* Finish the job that r48732 started. Move the remainder of themark@chromium.org2010-06-114-1698/+1
| | | | | | | | | | installer-related files from chrome/tools/build/mac to chrome/installer/mac. BUG=45017 TEST=none Review URL: http://codereview.chromium.org/2755007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49551 0039d316-1c4b-4281-b951-d872f2087c98
* Allow hdiutil makehybrid -hfs-openfolder to be disabled by the existingmark@chromium.org2010-06-111-1/+1
| | | | | | | | | | | | | | openfolder_bless configuration parameter. Disk images containing dirpatcher/goobsdiff updates should rarely fall directly into users' hands, but when they do, they don't need to open anything when they're mounted. BUG=45017 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49538 0039d316-1c4b-4281-b951-d872f2087c98
* Allow hdiutil makehybrid -hfs-openfolder to be disabled by the existingmark@chromium.org2010-06-111-2/+3
| | | | | | | | | | | | | | openfolder_bless configuration parameter. Disk images containing dirpatcher/goobsdiff updates should rarely fall directly into users' hands, but when they do, they don't need to open anything when they're mounted. BUG=45017 TEST=none Review URL: http://codereview.chromium.org/2762015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49537 0039d316-1c4b-4281-b951-d872f2087c98
* Merging issue 2067023 for bryner@google.comian@chromium.org2010-06-102-3/+25
| | | | | | | | | BUG=none TEST=safe_browsing_blocking_page_unittest.cc Review URL: http://codereview.chromium.org/2737005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49437 0039d316-1c4b-4281-b951-d872f2087c98
* Add UDRO support to pkg-dmg. This is only useful for testing.mark@chromium.org2010-06-101-13/+15
| | | | | | | | BUG=45017 TEST=none Review URL: http://codereview.chromium.org/2761004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49431 0039d316-1c4b-4281-b951-d872f2087c98
* Remove rlz.dll referenceseblake@chromium.org2010-06-092-6/+0
| | | | | | Review URL: http://codereview.chromium.org/2748005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49311 0039d316-1c4b-4281-b951-d872f2087c98
* Modify the password manager code to report at startup whether it is enableddpranke@chromium.org2010-06-071-0/+2
| | | | | | | | | | | | (by generating one of two UserActions). BUG=none R=tim@chromium.org, jar@chromium.org TEST=none Review URL: http://codereview.chromium.org/2638001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49123 0039d316-1c4b-4281-b951-d872f2087c98