summaryrefslogtreecommitdiffstats
path: root/views/controls
Commit message (Collapse)AuthorAgeFilesLines
* Convert LOG(INFO) to VLOG(1) - views/.pkasting@chromium.org2010-10-203-51/+0
| | | | | | | | | | This also removes DEBUG_MENU. I don't think the extra ints are a big deal. They should be optimized away in release mode. Also fixes a spelling error and converts some silly code to using early returns. BUG=none TEST=none Review URL: http://codereview.chromium.org/3908004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63150 0039d316-1c4b-4281-b951-d872f2087c98
* Move windows version-related stuff out of base/win_util and into ↵brettw@chromium.org2010-10-153-6/+7
| | | | | | | | | | | | | | base/win/windows_version. Many files now only need to include this instead of all of win_util. Remove a bunch of unused code from base/win_util. There was a surprising amount. Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62694 0039d316-1c4b-4281-b951-d872f2087c98
* [Win] Enable groups in list views when updating groups.bauerb@chromium.org2010-10-141-2/+4
| | | | | | | | | | | It seems ListView_RemoveAllGroups disables groups on Win XP, so we re-enable them afterwards. BUG=55452 TEST=Group headers in table views should be visible on XP Review URL: http://codereview.chromium.org/3760002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62516 0039d316-1c4b-4281-b951-d872f2087c98
* base: Move SplitString functions into the base namespace and update the callers.tfarina@chromium.org2010-10-141-1/+1
| | | | | | | | | BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3750001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62483 0039d316-1c4b-4281-b951-d872f2087c98
* The start of the instant opt-in mocks.sky@chromium.org2010-10-082-5/+14
| | | | | | | | | | | I also had to make it so you can turn off animations in CustomButton. BUG=54833 TEST=none Review URL: http://codereview.chromium.org/3544015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62009 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes another gray rect. This problem occurred because NativeViewHostsky@chromium.org2010-10-061-0/+2
| | | | | | | | | | | | | | was not correctly resetting state when the child was switched. In particular it wouldn't remove the clip when switching, which meant that if we switched back to an hwnd we had installed a clip we wouldn't reset the clip when we should have. BUG=57573 TEST=see bug Review URL: http://codereview.chromium.org/3605010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61688 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug in wrench menu where closing with menu open could triggersky@chromium.org2010-10-051-0/+1
| | | | | | | | | | | crash. BUG=56842 TEST=see bug Review URL: http://codereview.chromium.org/3552008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61474 0039d316-1c4b-4281-b951-d872f2087c98
* DOMUI implementation of Menu2.oshima@chromium.org2010-10-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few key design points. * Uses DOMView to render menu content. * MenuUI (subclass of DOMUI) uses GtkWiget tree to access WidgetGtk and MenuModel. Alternative way was to change TabContents::GetDOMUIForCurrentState() public and pass them throught it, but this seems to work fine. * Input/Focus is controlled by gtk_grab_add. Input is grabbed by the root widget, and then sent to each active menu widget via gtk_grab_add. * Menu gets shown after the renderer rendered the content (thus has some size) to avoid showing small/empty menu. Mouse processing is blocked until the menu is shown (see Dispatcher). A few issues that will be addressed in separate CL * RTL (will be after beta) * menu scroll. working on it now. * menu sometimes show scroll bar. (I just need to disable it) * unit test for native_menu_domui BUG=chromiun-os:6497 TEST=manual for now. all menu2 based meus should work as before (web pages's context menu, system menu, forward/back menu and several chromeos specific one) except for following two: * mnemonic should work now on context menus. * menu larger than screen does not scroll. I'll implement this in separate CL Review URL: http://codereview.chromium.org/3442018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61445 0039d316-1c4b-4281-b951-d872f2087c98
* Remove mnemonic and add keyboard shortcut text to the accessible name of ↵ctguil@chromium.org2010-10-013-21/+38
| | | | | | | | | | | | | text buttons in the wrench menu. Add breaks to GetAccessibleState switch statements. BUG=51738 TEST=Verify in NVDA and JAWS that text buttons are read without mnemonic and with keyboard shortcut. Review URL: http://codereview.chromium.org/3612001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61201 0039d316-1c4b-4281-b951-d872f2087c98
* Make the first-run search engine choice dialog accessible todmazzoni@chromium.org2010-09-303-1/+25
| | | | | | | | | | | Windows screenreaders. BUG=none TEST=manual testing with and without JAWS and NVDA screenreaders. Review URL: http://codereview.chromium.org/3598003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61090 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor RadioButton Image code for linux/gtkoshima@chromium.org2010-09-293-76/+122
| | | | | | | | | | | so that DOMUI menu can use the same image. BUG=none TEST=none Review URL: http://codereview.chromium.org/3435033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60972 0039d316-1c4b-4281-b951-d872f2087c98
* Add SetMinimumWidth to Menu2 for chromeos.oshima@chromium.org2010-09-297-0/+20
| | | | | | | | | | | | | This is to remove gtk dependency from menu2 code in chromeos and to make DOMUI transition smooth (crosbug.com/6497) Removed LanguageSwitchModel::GetFirstLevelMenuWidth as this does not seem to be used by anyone. BUG=none TEST=none Review URL: http://codereview.chromium.org/3533001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60961 0039d316-1c4b-4281-b951-d872f2087c98
* Make accessible getters return values instead of accepting an output ↵ctguil@chromium.org2010-09-2844-226/+124
| | | | | | | | | | | parameter. GetAccessibleName still needs to be converted. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/3416033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60828 0039d316-1c4b-4281-b951-d872f2087c98
* base: Finish moving the SplitString functions from string_util.h to ↵tfarina@chromium.org2010-09-241-0/+1
| | | | | | | | | | | 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
* FBTF: Move virtual methods to implementation files.erg@google.com2010-09-232-3/+5
| | | | | | | | | | | Remove logging.h and other headers where possible. BUG=none TEST=none Review URL: http://codereview.chromium.org/3461019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60369 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing the problem where accessibility events for password fields did not ↵chaitanyag@chromium.org2010-09-212-0/+5
| | | | | | | | set the password boolean field. Review URL: http://codereview.chromium.org/3353005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60106 0039d316-1c4b-4281-b951-d872f2087c98
* Make windows menu accelerators work in owner-draw mode.asargent@chromium.org2010-09-151-9/+5
| | | | | | | | | | | | | | | | | For items added to context menus by extensions, we display the extension's icon next to the top-level item. To display this icon, we use owner-draw mode, and it turns out that our code was assuming that we didn't need to tell windows about the labels of items in owner-draw mode. BUG=54497 TEST=Steps are outlined in the bug. Also all things menu related should be tested on windows.(wrench menu, context menus in web content, bookmark bar items, browser actions, etc.) Review URL: http://codereview.chromium.org/3402005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59560 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug in bookmark menus where using arrow keys would selectsky@chromium.org2010-09-132-3/+29
| | | | | | | | | | | invisible menu items. BUG=54800 TEST=see bug Review URL: http://codereview.chromium.org/3315021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59226 0039d316-1c4b-4281-b951-d872f2087c98
* [Win] Add per-plugin exceptions to content settings.bauerb@chromium.org2010-09-092-15/+26
| | | | | | | | | | | Screenshot: http://imgur.com/yxEzO.png BUG=39252 TEST=PluginExceptionsTableModel.* Review URL: http://codereview.chromium.org/3307014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58929 0039d316-1c4b-4281-b951-d872f2087c98
* Changes the max width for bookmark menus back to 400 and leaves themsky@chromium.org2010-09-072-9/+10
| | | | | | | | | | | | at 800 for the wrench menu. Apparently folks don't like wide bookmark menus. BUG=50653 TEST=see bug Review URL: http://codereview.chromium.org/3317011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58771 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bookmark menus to deal with multiple menus sharing the samesky@chromium.org2010-09-072-48/+123
| | | | | | | | | | | mnemonic. BUG=49728 TEST=see bug Review URL: http://codereview.chromium.org/3325015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58745 0039d316-1c4b-4281-b951-d872f2087c98
* Re-lands 58186:bryeung@chromium.org2010-09-0327-109/+111
| | | | | | | | | | | | | | | | | | | | Original message: """ Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 """ TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from ↵akalin@chromium.org2010-09-0227-111/+109
| | | | | | | | | | | | | | | | | | | | | base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.bryeung@chromium.org2010-09-0227-109/+111
| | | | | | | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
* Adds support for invisible menu items to bookmark menus and wires itsky@chromium.org2010-09-011-4/+7
| | | | | | | | | | | up for the wrench menu. BUG=46221, 54017 TEST=see bug Review URL: http://codereview.chromium.org/3289001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58218 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 58186 - Move the keyboard files from base/ to app/.phajdan.jr@chromium.org2010-09-0127-111/+109
| | | | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
* Move the keyboard files from base/ to app/.bryeung@chromium.org2010-09-0127-109/+111
| | | | | | | | | | | Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a regression in r56766oshima@chromium.org2010-09-011-0/+2
| | | | | | | | | | | CustomButton::OnKeyEvent should return false when the event is not handled BUG=chromium-os:6290 TEST=none Review URL: http://codereview.chromium.org/3276007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58111 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 7)thestig@chromium.org2010-08-279-27/+32
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3176026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57737 0039d316-1c4b-4281-b951-d872f2087c98
* Remove wstrings from bookmarks, part 12.viettrungluu@chromium.org2010-08-223-3/+5
| | | | | | | | | | | | | | - This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16 instead of a wstring. - This entailed changing the base class, ComboboxModel, and shaving a herd of yaks. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3159031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98
* Disable the stop button when the user is hovering it and the page finishes ↵pkasting@chromium.org2010-08-202-2/+24
| | | | | | | | | | | | | | loading, so we don't look like we stay loading forever. This change only does this for Mac and Windows, as GTK is going to be trickier. This also fixes a pair of other bugs on Windows and Linux: * Because we were setting the timer after telling the browser to reload, and the browser was calling us back synchronously, the timer had no effect. * Because the timer firing changed modes with |force| set to true, if the page finished loading before the timer fired, the timer would flip the button back to reload. BUG=46981 TEST=Hover the reload button and hit F5. When the page finishes loading, the stop button should become disabled. Mousing away should change it to an enabled reload button. Review URL: http://codereview.chromium.org/3198005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56925 0039d316-1c4b-4281-b951-d872f2087c98
* Add in a browser test for dialog resizing, which was catching an issue with ↵scottbyer@chromium.org2010-08-202-5/+14
| | | | | | | | | | | | | the way we were using GTK in toolkit views. Possibly related to 27365 or 38785. http://code.google.com/p/chromium-os/issues/detail?id=4126 BUG=chromium-os:4126 TEST=HtmlDialogBrowserTest.SizeWindow Review URL: http://codereview.chromium.org/2768006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56919 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove dead code, use early returns to reduce indenting, shorten.pkasting@chromium.org2010-08-192-112/+70
| | | | | | | | | | This makes one behavioral change: a mouse release with a successful HitTest and |canceled| true will set the state to HOT instead of NORMAL. This seemed more correct to me. BUG=none TEST=none Review URL: http://codereview.chromium.org/3175027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56766 0039d316-1c4b-4281-b951-d872f2087c98
* Another take on menu's. This uses the hosting menu scroll view container as ↵dtseng@chromium.org2010-08-193-4/+19
| | | | | | | | | | | | | | | | | a menubar on which we can fire MENUSTART and MENUEND events. The end result is that we now have the following scenario when a user opens a menu. 1. focus lands on the menu button. 2. down arrow. 3. A "chromium" menu item appears. 4. down arrow (or enter). 5. The first menu item gets focused. The only differences from what we currently have is Jaws/NVDA no longer say "context menu opened" or "applications". The first real menuitem also doesn't get focused when the menu shows. BUG=none. TEST=use NVDA and Jaws to navigate the menu's (opening, closing, submenus, accelerators). Review URL: http://codereview.chromium.org/3155029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56715 0039d316-1c4b-4281-b951-d872f2087c98
* Convert FillRect(... SkPaint) to DrawRect() since it doesn't necessarily ↵pkasting@chromium.org2010-08-181-1/+1
| | | | | | | | | | fill, it just draws with the provided paint. BUG=none TEST=none Review URL: http://codereview.chromium.org/3165032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56589 0039d316-1c4b-4281-b951-d872f2087c98
* Convert GetDisplayStringInLTRDirectionality from wstring to string16.tony@chromium.org2010-08-181-1/+2
| | | | | | | | BUG=23581 Review URL: http://codereview.chromium.org/3108027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56535 0039d316-1c4b-4281-b951-d872f2087c98
* Status menu change per chromium-os:5517xiyuan@chromium.org2010-08-172-2/+19
| | | | | | | | | | | | | | | | | | | | - Apply 10% white to selected menu button; - Remove the menu offset so that the menu is top aligned with toolbar; - Make all status area buttons derive from StatusAreaButton; - Move ClockMenuButton's text size logic into StatusAreaButton to share the logic with LanguageMenuButton; - Strip unused space from LanguageMenuButton so that it looks good with 10% white highlight; - Make LanguageMenuButton and ClockMenuButton center aligned; - Add 1-pixel padding at top when the vertical space is odd number so that text looks properly aligned with the icons; BUG=chromium-os:5517 TEST=Verify fix for chromium-os:5517. Review URL: http://codereview.chromium.org/3141019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56369 0039d316-1c4b-4281-b951-d872f2087c98
* Rework gfx::Font by moving platform-specific code into inner classes.ben@chromium.org2010-08-1323-51/+60
| | | | | | | | | | | | | gfx::Font is a platform-neutral API shim that exists as a wrapper object to allow for the creation and lifetime of gfx::Font objects to remain consistent with past usage. gfx::PlatformFont is an interface implemented by the platform-specific inner classes (gfx::PlatformFontWin,Mac,Gtk). BUG=none TEST=existing unittests Review URL: http://codereview.chromium.org/3083022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56040 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Get rid of TreeNodeChildrenReordered.tfarina@chromium.org2010-08-112-41/+3
| | | | | | | | | | | | Reason: This function was never implemented by TreeNodeModel and is unlike it will be. Also it proved to not be necessary at all. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3091016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55657 0039d316-1c4b-4281-b951-d872f2087c98
* Initialize most_recent_profile_ in constructor.ctguil@chromium.org2010-08-101-1/+1
| | | | | | | | | BUG=51631 TEST=Ensure chrome --first-run don't crash when opening the wrench menu. Review URL: http://codereview.chromium.org/3139002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55606 0039d316-1c4b-4281-b951-d872f2087c98
* Improvements to accessibility extension api support for "views":dmazzoni@chromium.org2010-08-062-5/+11
| | | | | | | | | | | | | 1. Handles the new wrench menu. 2. Uses NotifyAccessibilityEvent to find out when focus changes, rather than installing focus change listeners that need to be cleaned up. BUG=none TEST=Updated AccessibilityEventRouterViewsTest.TestFocusNotification Review URL: http://codereview.chromium.org/3056045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55196 0039d316-1c4b-4281-b951-d872f2087c98
* Enable better NVDA support for custom menus.ctguil@chromium.org2010-08-064-10/+25
| | | | | | | | | | | | - Send the popupmenu events on the MenuScrollViewContainer since it is the View with the ROLE_MENUPOPUP role. - Return AccessibilityTypes::STATE_FOCUSED for MenuScrollViewContainer since it's not focused by MenuHostWin::ShowMenuHost. NVDA won't process children menu item's focus events unless a parent claims to have focus. TEST=The wrench menu and it's menu items are read aloud when using NVDA. BUG=49360 Review URL: http://codereview.chromium.org/3015055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55163 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 1)thestig@chromium.org2010-08-051-1/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3071012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55034 0039d316-1c4b-4281-b951-d872f2087c98
* Add view class names to some classes used in the Wrench menu.dmazzoni@chromium.org2010-08-046-0/+45
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2832106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54960 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a deprecated wstring ToLower function.tony@chromium.org2010-08-042-3/+6
| | | | | | | | BUG=23581 Review URL: http://codereview.chromium.org/3044043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54946 0039d316-1c4b-4281-b951-d872f2087c98
* Remove wstrings from l10n_util/ResourceBundle locale functions.evan@chromium.org2010-08-041-2/+2
| | | | | | Review URL: http://codereview.chromium.org/3069026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54917 0039d316-1c4b-4281-b951-d872f2087c98
* Makes cut/copy/paste buttons centered with respect to thesky@chromium.org2010-08-032-7/+11
| | | | | | | | | | | | | separator. This proves a bit tricky as normally separators are closer to the bottom of the space provided. I've centered them now so that the buttons look centered too. BUG=50099 TEST=see bug Review URL: http://codereview.chromium.org/3072015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54772 0039d316-1c4b-4281-b951-d872f2087c98
* Add undeclared virtual destructors part 5ziadh@chromium.org2010-08-021-0/+3
| | | | | | | | | | | | | | | Preventative maintenance for abstract classes that do not declare virtual destructors. Base classes that do not declare their destructors as virtual could potentially lead to memory leaks. These files were discovered using the -Wnon-virtual-dtor flag in g++. r=jar BUG=47469 Review URL: http://codereview.chromium.org/3080013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54540 0039d316-1c4b-4281-b951-d872f2087c98
* Convert more callers of the integer/string functions to usingbrettw@chromium.org2010-07-311-2/+2
| | | | | | | | | | string_number_conversions.h TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3013046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54454 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove unneeded headers from app/ (part 2)thestig@chromium.org2010-07-3111-15/+4
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3066014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54437 0039d316-1c4b-4281-b951-d872f2087c98