summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_theme_pack.cc
Commit message (Collapse)AuthorAgeFilesLines
* Remove the bookmark menu.pkasting@chromium.org2010-07-011-10/+9
| | | | | | | | BUG=none TEST=--bookmark-menu no longer does anything Review URL: http://codereview.chromium.org/2853024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51403 0039d316-1c4b-4281-b951-d872f2087c98
* Re-apply r50278.aa@chromium.org2010-06-191-1/+1
| | | | | | | BUG=46632 TBR=rafaelw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50314 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r50278.aa@chromium.org2010-06-181-1/+1
| | | | | | TBR=rafaelw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50284 0039d316-1c4b-4281-b951-d872f2087c98
* Some app-related manifest cleanup:aa@chromium.org2010-06-181-1/+1
| | | | | | | | | | | | | | | | | | 1) Group app-related keys under a new "app" key, and change the implementation of IsApp() to just check that. 2) Rename IsApp() and IsTheme() -> is_app(), is_theme() to match style guide. 3) Remove web_content.enabled. That was a stupid idea. 4) Make some kind of launch URL required for apps. BUG=46632 Review URL: http://codereview.chromium.org/2836012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50278 0039d316-1c4b-4281-b951-d872f2087c98
* Fix up the Windows omnibox after the recent endcap removal. This fixes most ↵pkasting@chromium.org2010-06-141-11/+13
| | | | | | | | | | of the issues, but doesn't make the app launcher match the new style. BUG=45745 TEST=Omnibox has endcaps, insides are aligned and padded correctly, dropdown looks good Review URL: http://codereview.chromium.org/2721009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49727 0039d316-1c4b-4281-b951-d872f2087c98
* Detach reload from omnibox, combine with stop, and eliminate go.pkasting@chromium.org2010-06-111-25/+20
| | | | | | | | | | This does the basic surgery on all three OSes without trying to fix up the visual appearance. As a result, things look pretty ugly. My intent is to at least put endcaps on the omnibox in a subsequent patch. BUG=45745,45762,45763 TEST=Reload and stop should be combined; go should be gone. Review URL: http://codereview.chromium.org/2677003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49492 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a bunch of images that don't seem to be used.pkasting@chromium.org2010-06-081-28/+24
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2722003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49203 0039d316-1c4b-4281-b951-d872f2087c98
* Re-instate the temporary revert from r45267. That reverted certainshess@chromium.org2010-04-231-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omnibox, toolbar, tab animations, and other UI changes for purposes of testing and merging into mstone-5. Additionally reverts these CLs to fix the earlier revert: r45271: [Mac] Image references missing from Omnibox revert. r45268: GTK fix merge failure in uber-revert. Additional revert which fixed a bug for the branch: r45381: [Mac] Omnibox popup icons and text lined up under toolbar. Slight merge conflict which should be good: r45322: GTK: Implement OnDragCanceled() for autocomplete... Also ++kThemePackVersion and regenerate the cached theme pak. Re-instated changes: r45213: GTK: Override cursor colors in chrome-theme mode. r45103: Support drawing nano tabs in the tabstrip. r45084: GTK: Position the EV certificate stuff inside a green bubble. r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon... r44957: GTK: Tint the geolocation icons in gtk mode. r44943: Changes FormatURL to not strip http if the host starts with ft... r44930: Remove an icon that is no longer used. r44929: SSL UI changes, Windows, code side (images are separate). r44859: SSL UI changes (icons). TBRed since trybots hate binary patches. r44822: GTK: Select better greens in the native omnibox popup. r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat... r44789: [Mac] Bookmark star missing on NTP and BMM. r44775: [Mac] Centralize hack to make tests work with AutocompleteClas... r44678: Display the SECURITY_WARNING status in the location bar for the r44648: [Mac] Add an arrow cursor rect for the location image. r44615: Revert r44611 because it may have broken "unit_tests" on "Vist... r44611: Display the SECURITY_WARNING status in the location bar for the r44577: Revert 44572 - [Mac] Update locationbar icon as user types. r44572: [Mac] Update location-bar icon as user types. r44555: GTK: Use correct button mask on reload button. r44545: [Mac] Omnibox text drag drag URL when select-all. r44523: GTK: Prevent inappropriate drag of location bar location icon. r44519: GTK: make the primary selection include the url's scheme when ... r44492: [Mac] Fix search icon in keyword search to be right-side-up. r44415: GTK: Update top padding on icons in the autocomplete popup. r44401: GTK: Tint omnibox icons in GTK mode differently. r44380: GTK: Move reload in gtk mode and fix omnibox popup location. r44282: Fixes crash in autocomplete when typing some URLs. The problem r44273: [Mac] PDF icons for omnibox nits. r44269: Fix build break due to bad merge resolve r44268: Shift omnibox dropdown in and up on Windows, and square off th... r44178: GTK: fix TTS padding. r44177: Round the top left and right edges of the toolbar. r44171: Images only checkin for try server goodness. r44163: GTK: fix padding of autocomplete popup. r44152: [Mac] PDF icons for omnibox. r44145: GTK: Theme the icons in the location bar and use GTK colors fo... r44140: Strips http from the omnibox r44131: Fixes bugs in new tab strip animations where they weren't doin... r44116: Change the default theme colors. r44117: Add newline to EOF to fix CrOS builder. r44115: Make the bottom edges of the opaque frame rounded. r44091: [Mac] No star icon or page actions in omnibox on popups. r44087: Don't allow drag or click on location icon when editing in omn... r44021: [GTK] Add TTS lens graphic to linux TTS box. r44008: [Mac] Tweak location icon spacing in omnibox. r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca... r43972: Make the firstrun bubble point at a better spot now that the l... r43971: [Mac] Location icon in omnibox as drag source. r43970: Make the star and page action icons not appear on popup windows. r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip: r43787: Allow location icon to be dragged & dropped. This also fixes ... r43759: Changes end cap of tab-to-search images. r43740: Change bookmark bar toggle to ctrl-shift-b. r43723: Show Page Info dialog on mouse up, not mouse down. r43677: Fix Mac build failure. r43676: Replace omnibox icons with new set that are all the same size ... r43596: Fix browser test TestStarButtonAccObj. r43593: Disables TestStarButtonAccObj. r43582: Changes tab strip to use BoundsAnimator for tab strip animatio... r43563: GTK: don't show reload button for popup/app windows. r43562: Star/reload shuffle, Windows version. r43540: [Mac] Magnifying glass in keyword-search bubble. r43482: Adds images needed for new tab animation. I'm separating this ... r43422: Add reload mask resource. r43392: GTK: make the location icon a drag source. r43376: [Mac] Move star button into page-actions area of omnibox. r43357: [Mac] Line up omnibox popup under field. r43290: gtk: fix display of icons in omnibox popup r43269: GTK: fix reload button. r43249: [Mac] Rearrange SSL status icon/label in omnibox. r43248: BrowserThemePack: Adds persistant ids for the reload endcaps. r43241: GTK: more location bar updates. r43191: Fix memory leak in BrowserThemePack. r43154: GTK: set the new star button's ID r43151: Fix bad conflict resolution for r43146. r43146: GTK: toolbar reload/star shuffle. r43025: Show the location bar icon (almost) all the time, and have its... r43023: Add new images for new reload button. No code change. r42782: Remove this icon, now that it's no longer used (due to my secu... r42502: Omnibox M5 work, part 1: Security changes r42245: Check in new icons for omnibox security changes alone, so that... BUG=none TEST=People go back to complaining about missing http://. R=pkasting@chromium.org,beng@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily revert certain Omnibox, toolbar, tab animations, and othershess@chromium.org2010-04-221-31/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI changes for purposes of testing and merging into mstone-5. Also ++kThemePackVersion and regenerate the cached theme pak. Reverted changes: r45213: GTK: Override cursor colors in chrome-theme mode. r45103: Support drawing nano tabs in the tabstrip. r45084: GTK: Position the EV certificate stuff inside a green bubble. r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon... r44957: GTK: Tint the geolocation icons in gtk mode. r44943: Changes FormatURL to not strip http if the host starts with ft... r44930: Remove an icon that is no longer used. r44929: SSL UI changes, Windows, code side (images are separate). r44859: SSL UI changes (icons). TBRed since trybots hate binary patches. r44822: GTK: Select better greens in the native omnibox popup. r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat... r44789: [Mac] Bookmark star missing on NTP and BMM. r44775: [Mac] Centralize hack to make tests work with AutocompleteClas... r44678: Display the SECURITY_WARNING status in the location bar for the r44648: [Mac] Add an arrow cursor rect for the location image. r44615: Revert r44611 because it may have broken "unit_tests" on "Vist... r44611: Display the SECURITY_WARNING status in the location bar for the r44577: Revert 44572 - [Mac] Update locationbar icon as user types. r44572: [Mac] Update location-bar icon as user types. r44555: GTK: Use correct button mask on reload button. r44545: [Mac] Omnibox text drag drag URL when select-all. r44523: GTK: Prevent inappropriate drag of location bar location icon. r44519: GTK: make the primary selection include the url's scheme when ... r44492: [Mac] Fix search icon in keyword search to be right-side-up. r44415: GTK: Update top padding on icons in the autocomplete popup. r44401: GTK: Tint omnibox icons in GTK mode differently. r44380: GTK: Move reload in gtk mode and fix omnibox popup location. r44282: Fixes crash in autocomplete when typing some URLs. The problem r44273: [Mac] PDF icons for omnibox nits. r44269: Fix build break due to bad merge resolve r44268: Shift omnibox dropdown in and up on Windows, and square off th... r44178: GTK: fix TTS padding. r44177: Round the top left and right edges of the toolbar. r44171: Images only checkin for try server goodness. r44163: GTK: fix padding of autocomplete popup. r44152: [Mac] PDF icons for omnibox. r44145: GTK: Theme the icons in the location bar and use GTK colors fo... r44140: Strips http from the omnibox r44131: Fixes bugs in new tab strip animations where they weren't doin... r44116: Change the default theme colors. r44117: Add newline to EOF to fix CrOS builder. r44115: Make the bottom edges of the opaque frame rounded. r44091: [Mac] No star icon or page actions in omnibox on popups. r44087: Don't allow drag or click on location icon when editing in omn... r44021: [GTK] Add TTS lens graphic to linux TTS box. r44008: [Mac] Tweak location icon spacing in omnibox. r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca... r43972: Make the firstrun bubble point at a better spot now that the l... r43971: [Mac] Location icon in omnibox as drag source. r43970: Make the star and page action icons not appear on popup windows. r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip: r43787: Allow location icon to be dragged & dropped. This also fixes ... r43759: Changes end cap of tab-to-search images. r43740: Change bookmark bar toggle to ctrl-shift-b. r43723: Show Page Info dialog on mouse up, not mouse down. r43677: Fix Mac build failure. r43676: Replace omnibox icons with new set that are all the same size ... r43596: Fix browser test TestStarButtonAccObj. r43593: Disables TestStarButtonAccObj. r43582: Changes tab strip to use BoundsAnimator for tab strip animatio... r43563: GTK: don't show reload button for popup/app windows. r43562: Star/reload shuffle, Windows version. r43540: [Mac] Magnifying glass in keyword-search bubble. r43482: Adds images needed for new tab animation. I'm separating this ... r43422: Add reload mask resource. r43392: GTK: make the location icon a drag source. r43376: [Mac] Move star button into page-actions area of omnibox. r43357: [Mac] Line up omnibox popup under field. r43290: gtk: fix display of icons in omnibox popup r43269: GTK: fix reload button. r43249: [Mac] Rearrange SSL status icon/label in omnibox. r43248: BrowserThemePack: Adds persistant ids for the reload endcaps. r43241: GTK: more location bar updates. r43191: Fix memory leak in BrowserThemePack. r43154: GTK: set the new star button's ID r43151: Fix bad conflict resolution for r43146. r43146: GTK: toolbar reload/star shuffle. r43025: Show the location bar icon (almost) all the time, and have its... r43023: Add new images for new reload button. No code change. r42782: Remove this icon, now that it's no longer used (due to my secu... r42502: Omnibox M5 work, part 1: Security changes r42245: Check in new icons for omnibox security changes alone, so that... BUG=none TEST=Eyjafjallajokull R=pkasting@chromium.org,beng@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45267 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure tint for frame_incognito is stored in "Cached Theme.pak".erg@chromium.org2010-04-211-0/+1
| | | | | | | | | BUG=41743 TEST=See bug Review URL: http://codereview.chromium.org/1758001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45222 0039d316-1c4b-4281-b951-d872f2087c98
* Star/reload shuffle, Windows version.pkasting@chromium.org2010-04-031-54/+28
| | | | | | | | BUG=27570 TEST=Star should be moved to right hand end of location bar, reload to left endcap. Review URL: http://codereview.chromium.org/1561009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43562 0039d316-1c4b-4281-b951-d872f2087c98
* BrowserThemePack: Adds persistant ids for the reload endcaps.erg@chromium.org2010-03-311-4/+11
| | | | | | | | | | | This makes the new reload button tinted when themed. BUG=none TEST=none Review URL: http://codereview.chromium.org/1601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43248 0039d316-1c4b-4281-b951-d872f2087c98
* Fix memory leak in BrowserThemePack.thestig@chromium.org2010-03-311-0/+2
| | | | | | | | | BUG=37866 TEST=Linux/CrOS Valgrind unit goes green. TBR=estade,erg Review URL: http://codereview.chromium.org/1551008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43191 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: toolbar reload/star shuffle.estade@chromium.org2010-03-301-1/+1
| | | | | | | | | BUG=37866 TEST=manual Review URL: http://codereview.chromium.org/1491003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43146 0039d316-1c4b-4281-b951-d872f2087c98
* Move more files to toplevel gfx.ben@chromium.org2010-03-191-1/+1
| | | | | | | | | TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42071 0039d316-1c4b-4281-b951-d872f2087c98
* Move image codec stuff to toplevel gfx.ben@chromium.org2010-03-181-1/+1
| | | | | | | | | TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41911 0039d316-1c4b-4281-b951-d872f2087c98
* chrome 1: string_util.h -> utf_string_conversions.h fix.jhawkins@chromium.org2010-03-081-2/+5
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/672001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40937 0039d316-1c4b-4281-b951-d872f2087c98
* This reverts r38541, which reverts previous reverts.erg@chromium.org2010-02-101-8/+38
| | | | | | | | | | | | | This will re-introduce a mac performance regression but will make the code correct. R=mirandac (over shoulder) BUG=34775,34078 TEST=none Review URL: http://codereview.chromium.org/600045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38636 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r38006 and r38018 to try to fix the mac perf regression.erg@chromium.org2010-02-091-38/+8
| | | | | | | | | BUG=34755,34078 TEST=none Review URL: http://codereview.chromium.org/600026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38541 0039d316-1c4b-4281-b951-d872f2087c98
* Revert debugging crud I added while trying to track down bug 31719.erg@chromium.org2010-02-051-43/+7
| | | | | | | | | | | | Revert "Speculative fix for the windows theme crasher." (r36036) Revert "More debugging statements to try to track down BrowserThemePack crash." (r37259). BUG=31719 TEST=none Review URL: http://codereview.chromium.org/573036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38279 0039d316-1c4b-4281-b951-d872f2087c98
* linux: build with -Wextraevan@chromium.org2010-02-051-3/+3
| | | | | | | | | | | | 95% of this is removing "const" from return types, but turning this on found one bug! (A "for" loop that expected its iterator to go negative but which was using an unsigned type.) BUG=34160 Review URL: http://codereview.chromium.org/570012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38266 0039d316-1c4b-4281-b951-d872f2087c98
* Don't crash when a theme specifies a non-existant image.erg@chromium.org2010-02-051-2/+10
| | | | | | | | | | | Fixes the current TopCrasher. BUG=31719 TEST=BrowserThemePackTest.TestNonExistantImages Review URL: http://codereview.chromium.org/572039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38242 0039d316-1c4b-4281-b951-d872f2087c98
* Themes: HasCustomImage() must only return true for images that were providederg@google.com2010-02-031-12/+42
| | | | | | | | | | | | | by the extension and not for images that were autogenerated. Since this adds data to the theme pack file, bump the version number. BUG=34078 TEST=BrowserThemePackTest.TestHasCustomImage Review URL: http://codereview.chromium.org/562025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38006 0039d316-1c4b-4281-b951-d872f2087c98
* Don't store IDR ids in ThemePack files as they change whenever the grd is ↵erg@google.com2010-02-011-68/+219
| | | | | | | | | | | | | | | | | modified. Instead, add an association table at the top of browser_theme_pack.cc that maps the JSON string name and IDR# to a stable constant that won't change between releases. The ThemePack version number has been bumped to two, forcing a rebuild. BUG=33416 TEST=none Review URL: http://codereview.chromium.org/548207 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37722 0039d316-1c4b-4281-b951-d872f2087c98
* More debugging statements to try to track down BrowserThemePack crash.erg@google.com2010-01-271-4/+43
| | | | | | | | | BUG=31719 TEST=none Review URL: http://codereview.chromium.org/552174 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37259 0039d316-1c4b-4281-b951-d872f2087c98
* Speculative fix for the windows theme crasher.erg@chromium.org2010-01-121-3/+0
| | | | | | | | | | | | | | I have no good ideas about this, so I'm moving the theme building to the UI thread to remove the possibility of clobbering the memory of the Task*. If THAT doesn't work, I've tried to get the theme name into the stack trace and therefore the minidumps. BUG=31719 TEST=none Review URL: http://codereview.chromium.org/536024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36036 0039d316-1c4b-4281-b951-d872f2087c98
* linux: reduce header interdependenciesevan@chromium.org2009-12-291-0/+1
| | | | | | | | | | | | By analyzing gcc -H output, I found some of our worst offenders for headers bringing in other headers. native_web_keyboard_event.h was responsible for just under 60,000 extra includes! This change will in theory make the build faster. Review URL: http://codereview.chromium.org/524004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35326 0039d316-1c4b-4281-b951-d872f2087c98
* BrowserThemePack: Move encoding the processed images to the writing thread.erg@google.com2009-12-171-26/+42
| | | | | | | | | BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/504032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34786 0039d316-1c4b-4281-b951-d872f2087c98
* Deal with themes that don't provide certain sections. Fixes crasher in new ↵erg@google.com2009-12-151-2/+11
| | | | | | | | | | | themes system. BUG=30453 TEST=Installing https://chrome.google.com/extensions/detail/immljcnndlfdiajkpggdjbikmnibdhhi doesn't crash chrome. Review URL: http://codereview.chromium.org/506014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34602 0039d316-1c4b-4281-b951-d872f2087c98
* GTK: Fix regression where we don't build tinted buttons in GTK theme mode.erg@google.com2009-12-151-26/+8
| | | | | | | | | | (Caused by my r34486) TEST=Use GTK+ mode. page/app menu button should have same tint as title bar. BUG=NONE Review URL: http://codereview.chromium.org/507002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34566 0039d316-1c4b-4281-b951-d872f2087c98
* Try 2: Completely redo how themes are stored on disk and processed at ↵erg@google.com2009-12-141-0/+864
| | | | | | | | | | | | | | | | | install time. Same as previous patch, except we now have a BrowserThemeProvider::GetDefaultDisplayProperty() so we don't have UMRs in ntp_resource_cache.cc. BUG=24493,21121 TEST=All the new unit tests pass. All the complex theme startup tests go faster. Previous Review URL: http://codereview.chromium.org/460050 Review URL: http://codereview.chromium.org/499004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34486 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Completely redo how themes are stored on disk and processed at installerg@google.com2009-12-111-864/+0
| | | | | | | | | | time," as it fails valgrind tests. This reverts commit 86faccd1028937a69ccc718718fd48c06c0cd471 (r34379). Review URL: http://codereview.chromium.org/490025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34385 0039d316-1c4b-4281-b951-d872f2087c98
* Completely redo how themes are stored on disk and processed at install time.erg@google.com2009-12-111-0/+864
Rewrites most of BrowserThemeProvider and adds a new class BrowserThemePack. BrowserThemePack takes all the logic of generating resources out of the BrowserThemeProvider, does all of them at theme install time (previously, we lazily generated all the button images and a good number of colors, which muddled logic quite a bit), and then writes all the data out into an mmap()able file to speed startup when a theme is installed. In addition, this changes how the GtkThemeProvider works. The GtkThemeProvider now generates all of its images lazily and doesn't reach into the implementation details of BrowserThemeProvider as it used to. BUG=24493,21121 TEST=All the new unit tests pass. All the complex theme startup tests go faster. Review URL: http://codereview.chromium.org/460050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34379 0039d316-1c4b-4281-b951-d872f2087c98