summaryrefslogtreecommitdiffstats
path: root/views
Commit message (Collapse)AuthorAgeFilesLines
* views: Use FRIEND_TEST_ALL_PREFIXES.tfarina@chromium.org2010-06-051-5/+5
| | | | | | | | | BUG=44549 TEST=trybots Review URL: http://codereview.chromium.org/2699003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49011 0039d316-1c4b-4281-b951-d872f2087c98
* Add cross platform Widget::InitWithWidget(parent, const gfx::Rect& bounds);oshima@chromium.org2010-06-057-10/+32
| | | | | | | | | | | | | On linux, native parent has to be either window_contents or widget depending of the type of wiget. InitWithWidget takes a parent Widget instead of native and hides these details. I also cleaned up a few dead/duplicated code. BUG=none TEST=none Review URL: http://codereview.chromium.org/2355003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48990 0039d316-1c4b-4281-b951-d872f2087c98
* Create CompositePainter once for a widget instead of ref count.oshima@chromium.org2010-06-021-26/+14
| | | | | | | | | | | | | | | There is a issue in adding new composited child after the ref count of painter became zero. RefCount::Release does not tell if it's been deleted so it can't remove the painter key from G_OBJECT(widget). I could have changed RefCounted::Release to return true, but I took this approach because new child will be added later in most use case (like info bubble), and it's more efficient to keep the painter rather than creating and deleting each time. BUG=none TEST=none Review URL: http://codereview.chromium.org/2449010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48757 0039d316-1c4b-4281-b951-d872f2087c98
* Added const to image parameters for ImageButton class.avayvod@google.com2010-06-022-10/+13
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2418003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48748 0039d316-1c4b-4281-b951-d872f2087c98
* Process accelerators if grabbed widget is a window.xiyuan@chromium.org2010-06-021-4/+17
| | | | | | | | | | | Update the gtk event filtering logic to process key events for grabbed window (i.e. modal dialog). BUG=chromium-os:3701 TEST=Verify fix for chromium-os:3701. Review URL: http://codereview.chromium.org/2455004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48742 0039d316-1c4b-4281-b951-d872f2087c98
* views: implement a TODO to move WidgetGtk::GetWindowForNative to WindowGtk.tfarina@chromium.org2010-06-025-25/+24
| | | | | | | | | BUG=NONE TEST=compiles. Review URL: http://codereview.chromium.org/1640003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48717 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing AutoReset to be a template.gspencer@chromium.org2010-06-012-2/+2
| | | | | | | | | | | I've run into a couple of times this week when I needed one of these, for two different types besides bool. Time to fix the TODO. TEST=trybots FTW, and built locally. BUG=none Review URL: http://codereview.chromium.org/2394001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48644 0039d316-1c4b-4281-b951-d872f2087c98
* views: Move BoxLayout class into views/examples directory.tfarina@chromium.org2010-05-284-58/+95
| | | | | | | | | | | Also add horizontal support as well. BUG=None TEST=out/Debug/view_examples, see Widget tab. Review URL: http://codereview.chromium.org/2145001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48460 0039d316-1c4b-4281-b951-d872f2087c98
* Initial work to fix the IAccessible tree in circumstances where there is a ↵ctguil@chromium.org2010-05-2710-31/+78
| | | | | | | | | | widget not at the root of the UI heirarchy. Also contains misc fixes for setting correct name/role for controls found in the Options dialog. BUG=9621 TEST=none Review URL: http://codereview.chromium.org/2174002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48444 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will make mbelshe@chromium.org2010-05-271-1/+1
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Another dependency the bbot missed!!!"rafaelw@chromium.org2010-05-261-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98. Revert "Missed a file as part of checkin for r48186" This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b. Revert "Enable warning 4389 as an error on windows builds. This will make" This reverts commit c78936bcfc65b98edf288191d927a495b0364621. TBR=mbelshe Review URL: http://codereview.chromium.org/2253001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
* Add bug number in comments for each TreeViewTest marked as FAILSrafaelw@chromium.org2010-05-251-1/+11
| | | | | | | | | TBR=phajdan.jr TEST=NONE Review URL: http://codereview.chromium.org/2223001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48214 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will makembelshe@chromium.org2010-05-251-1/+1
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2081007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
* Bound checkingon TableViewjcivelli@chromium.org2010-05-253-29/+43
| | | | | | | | | | Adding bound checking to View <-> Model methods to investigate unit-tests failures. BUG=None TEST=unit-tests should still pass Review URL: http://codereview.chromium.org/2069019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48185 0039d316-1c4b-4281-b951-d872f2087c98
* Mark TreeViewTests as FAILS_ rather than DISABLED_rafaelw@chromium.org2010-05-251-11/+12
| | | | | | | | | TBR=jcivelli BUG=45015 Review URL: http://codereview.chromium.org/2171006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48168 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling TableViewTests (failing on vista)rafaelw@chromium.org2010-05-251-9/+9
| | | | | | | | TBR=jcivelli Review URL: http://codereview.chromium.org/2112017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48164 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes a couple of leaks in use of gdk_get_property.sky@chromium.org2010-05-251-0/+1
| | | | | | | | | BUG=44945 TEST=none Review URL: http://codereview.chromium.org/2089024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48161 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed alt key as shortcut to focus menus on linux/views. It should onlydmazzoni@chromium.org2010-05-243-21/+239
| | | | | | | | | | | | trigger when you press and release Alt and no other keys. Previously it could trigger when Alt was released as part of some other key combination. BUG=40754 TEST=Added new test, accelerator_handler_gtk_unittest.cc Review URL: http://codereview.chromium.org/2128011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48095 0039d316-1c4b-4281-b951-d872f2087c98
* Add multiline support to views::TextField.xiyuan@chromium.org2010-05-225-41/+309
| | | | | | | | | | | | | | - Add a GtkViewsTextView derived from GtkTextView and supports border and info text when empty; - Update NativeTextfieldGtk to use GtkViewsTextView for multiline text; - Remove the multiline suppression in BugReportView; BUG=chromium-os:3426 TEST=Verify feedback dialog on ChromeOS uses multiline text edit for description field. Review URL: http://codereview.chromium.org/2138003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47986 0039d316-1c4b-4281-b951-d872f2087c98
* Revert revisions 47902 and 47900.dpolukhin@chromium.org2010-05-211-10/+5
| | | | | | | | | | | | Chrome UI blinks after replacement of gtk_widget_set_size_request with gtk_widget_size_allocate on resizing or infobar appearing animation. It happens because gtk_widget_size_allocate results in background resizing on message loop idle. It looks like we can't use gtk_widget_size_allocate at this place at all. Review URL: http://codereview.chromium.org/2131021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47913 0039d316-1c4b-4281-b951-d872f2087c98
* NativeViewHostGtk should use gtk_views_fixed instead of gtk_fixeddpolukhin@chromium.org2010-05-211-5/+10
| | | | | | | | | | | | and avoid calling gtk_widget_set_size_request to don't spoil preferred size for native controls. BUG=crosbug.com/2876 TEST=See bug description. Review URL: http://codereview.chromium.org/2068006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47900 0039d316-1c4b-4281-b951-d872f2087c98
* views: Use STLDeleteElements to delete pointer objects.tfarina@chromium.org2010-05-211-17/+6
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/2135002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47879 0039d316-1c4b-4281-b951-d872f2087c98
* Elide the EV bubble when it's extremely long. This limits it to half the ↵pkasting@chromium.org2010-05-203-16/+35
| | | | | | | | | | location bar width, unless eliding to that would result in a width of less than 150 px. BUG=42856 TEST=Visit https://www.barbican.org.uk/eticketing/index.asp and make the window smaller. The EV bubble should shrink, eliding in middle, until it hits a minimum size. Review URL: http://codereview.chromium.org/2084012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47819 0039d316-1c4b-4281-b951-d872f2087c98
* Views menu gradient change for ChromeOS to sync with gtk theme change.xiyuan@chromium.org2010-05-201-5/+3
| | | | | | | | | BUG=chromium-os:2691 TEST=Verify views menu on bookmark bar etc also use the subtle gradient. Review URL: http://codereview.chromium.org/2117017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47803 0039d316-1c4b-4281-b951-d872f2087c98
* Clear password field when navigating though users on the login screen.nkostylev@google.com2010-05-203-3/+12
| | | | | | | | | BUG=chromium-os:2319 TEST=Enter password on the login screen. Navigate to the left/right user window. Navigate back. Password field should be empty. Review URL: http://codereview.chromium.org/2132011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47785 0039d316-1c4b-4281-b951-d872f2087c98
* A crasher would sometimes happen when opening a selet file dialogjcivelli@chromium.org2010-05-191-0/+5
| | | | | | | | | | | | | | | | | | | (such as when loading an unpacled extension). This is because we would reinterpret cast the user data of the HWND to a WidgetWin, and in that case the Windows dialog has a user-data that we did not set. This CL checks that the HWND is at least a WindowImpl before attempting to retrieve the WidgetWin, ensuring we won't mess with windows we did not create directly. BUG=44312 TEST=Open the extension page. Move the focus by pressing TAB to the "Load unpacked extension..." button. Press ENTER many times quickly so it opens/closes the "Select dir" dialog. It should not crash. Review URL: http://codereview.chromium.org/2124009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47672 0039d316-1c4b-4281-b951-d872f2087c98
* Provide accessibility support for Window_win.ctguil@chromium.org2010-05-178-62/+139
| | | | | | | | TEST=Ensure that the About Chrome dialog has proper accessibility role. BUG=none Review URL: http://codereview.chromium.org/1838002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47454 0039d316-1c4b-4281-b951-d872f2087c98
* Refactors TabStrip code for better sharing between TabStrip andsky@chromium.org2010-05-132-2/+2
| | | | | | | | | | | | SideTabStrip. I still have a bunch of cleanup to do, but this is a good checkpoint. BUG=none TEST=none Review URL: http://codereview.chromium.org/2037012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47202 0039d316-1c4b-4281-b951-d872f2087c98
* Re-organize RenderViewContextMenu to the use cross-platform MenuModel class.estade@chromium.org2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | Benefits: - less code - more straightforward code - more shared code unresolved issues: - RenderViewContextMenu{Gtk,Mac,Views} should not be a subclass of RenderViewContextMenu - On Linux, IMEs are added in the wrong place (not near the other editable stuff) BUG=31365 TEST=manual + trybots Review URL: http://codereview.chromium.org/2017001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46987 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes possible crash when menus were destroyed. I wasn't resetting asky@chromium.org2010-05-111-0/+2
| | | | | | | | | | | pointer, leading to bad data write on destruction. BUG=42513 TEST=see bug Review URL: http://codereview.chromium.org/2013016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46974 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate View::UILayoutIsRightToLeft() to standardize on ↵pkasting@chromium.org2010-05-1018-63/+33
| | | | | | | | | | base::i18n::IsRTL(). Was only needed for EnableUIMirroringForRTLLanguages(), which was only used by Views::Label, which already had this capability via set_rtl_alignment_mode(). BUG=none TEST=none Review URL: http://codereview.chromium.org/1991002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46869 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build failure due to bad merge resolvepkasting@chromium.org2010-05-101-1/+1
| | | | | | | | BUG=43259 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46834 0039d316-1c4b-4281-b951-d872f2087c98
* Add tooltip support to Windows tables.pkasting@chromium.org2010-05-102-9/+89
| | | | | | | | | | This doesn't actually make use of the functionality yet, but we get a nice benefit for free: by turning this on, we automatically get "labeltips" (see comments in the code) for all elided items in tables. BUG=43259 TEST=Hover any elided item in a table and it should display a tooltip with the full item text atop it. Review URL: http://codereview.chromium.org/2012006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46832 0039d316-1c4b-4281-b951-d872f2087c98
* Remove checkbox table support, as it is unused.pkasting@chromium.org2010-05-105-163/+39
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2009007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46829 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a few stray bits of win2k support.pkasting@chromium.org2010-05-072-13/+4
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1998012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46753 0039d316-1c4b-4281-b951-d872f2087c98
* This CL fixes issue 42867 - "OK" button disabled on "Edit Exception" dialog boxxji@chromium.org2010-05-071-1/+8
| | | | | | | | | | | | | | | | | | | | when URL is modified in non-empty input field - RTL In RTL chrome in windows, the text get from "Pattern" text field is wrapped with LRE/POP, which makes the pattern invalid. Trim explicit bidi control characters off in NativeTextfieldWin::GetText(). BUG=http://crbug.com/42867 TEST= 1. Launch Chrome with RTL language UI 2. click Wrench => Options => Under the Hood => Content settings => Exceptions => Edit... 3. modify an existing url on the Pattern field. The "OK" button should not be grayed out. Review URL: http://codereview.chromium.org/1703026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46751 0039d316-1c4b-4281-b951-d872f2087c98
* New visuals for notifications on Windows.johnnyg@chromium.org2010-05-071-1/+1
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1980005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46690 0039d316-1c4b-4281-b951-d872f2087c98
* Committing on behalf of dtseng.dmazzoni@chromium.org2010-05-071-0/+7
| | | | | | | | | | | | | | | | We currently only set focus to the widget's hWnd, but we really want to also notify assistive technologies that a child view received focus so that it can know to obtain an IAccessible for that custom child view using the widget hWnd. The widget hWnd has our implementation of IAccessible through AccessibilityWrapper/ViewAccessibility. Original code review: http://codereview.chromium.org/1985002 BUG=43363 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46687 0039d316-1c4b-4281-b951-d872f2087c98
* Explicitly call gtk_widget_show_all() to show the treeview in the language ↵yusukes@google.com2010-05-071-0/+2
| | | | | | | | | | | config dialog. BUG=chromium-os:2877 TEST=manual. verified that the tree view widget is shown as expected. Review URL: http://codereview.chromium.org/2038001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46656 0039d316-1c4b-4281-b951-d872f2087c98
* some more fixes for ignored scoped_ptr::release() callsestade@chromium.org2010-05-064-23/+10
| | | | | | | | | BUG=42904 TEST=bots Review URL: http://codereview.chromium.org/1982001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46622 0039d316-1c4b-4281-b951-d872f2087c98
* Host cookie modal dialog and js modal modal dialog in NativeDialogHostxiyuan@chromium.org2010-05-061-5/+9
| | | | | | | | | | | | | | | | | | | | | - Enable modal dialog in NativeDialogHost. This is not fully work in ChromeOS because e.g. user could still alt-tab away. However, setting modal would block user from interacting with relevant browser window and avoid crashes; - Move dialog close code from NativeHostDialog's destructor to WindowClosing because a dialog's "response" signal handler could rely on the contents; - Add "check-resize" signal handler to make GtkExpander work nicely with NativeDialogHost; - Add ShowModalDialogWithMinLocalizedWidth to gtk_util for cookie and js modal dialog; - Change in WidgetGtk::SetBounds to call gtk_window_move/resize always to keep GtkWindow's geometry info up-to-date; BUG=none TEST=Verify cookie prompt and js dialog on ChromeOS is hosted in a Chrome window and not occupy the whole screen. Review URL: http://codereview.chromium.org/1995001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46619 0039d316-1c4b-4281-b951-d872f2087c98
* Make Font::GetStringWidth() a shortcut for gfx::Canvas::SizeStringInt() on ↵pkasting@chromium.org2010-05-051-2/+4
| | | | | | | | | | | | Windows. These two functions already did the same thing on Mac and Linux. If they ever returned different results on Windows, it would lead to subtle bugs, since measurement and drawing would slightly disagree. Clean up a few other things so that all three implementations of GetStringWidth() are identical. BUG=38717 TEST=none Review URL: http://codereview.chromium.org/1928003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46492 0039d316-1c4b-4281-b951-d872f2087c98
* This CL fixes issue 41985 - The focus frames are out of range on the Options ↵xji@chromium.org2010-05-053-14/+329
| | | | | | | | | | | | | | | | | | | | : RTL. Previously, Label::CalculateDrawStringParams() computes the text boundary for signle-line and multi-line texts differently, so the boundary of focus rectangle is computed differently too inside Label::Paint(). Now, Label::CalculateDrawStringParams() computes text boundary without differentiate single-line and multi-line text, the boundary itself always takes mirror into consideration. So, the boundary of focus rectangle no longer need mirroring for both cases. BUG=http://crbug.com/41985 TEST= 1. Launch Chrome with RTL languages UI (ex: chrome.exe --lang=he) 2. click Wrench => Options Under the Hood 3. click or press tab to focus any string there. 4. the focus should be around the text, not out of the text range. Review URL: http://codereview.chromium.org/1694012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46484 0039d316-1c4b-4281-b951-d872f2087c98
* Close menu on grab broke event.oshima@chromium.org2010-05-053-2/+17
| | | | | | | | | | | This is necessary for screen locker to grab the input event. Technically, this can happen when another part of chrome tries to grab the input, so this is safer to handle this. BUG=none TEST=none Review URL: http://codereview.chromium.org/1900002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46441 0039d316-1c4b-4281-b951-d872f2087c98
* Add transparency to TYPE_CHILD WidgetGtk.oshima@chromium.org2010-05-053-57/+196
| | | | | | | | | | | | | | | * This does not work with renderer as parent yet.(I need to investigate renderer what it's doing) * gtk_widget_set_back_pixmap is not necessary and removed. * changed to use clear operation to fill a background with transparent color. BUG=none TEST=manual: added transparent widget example to view_examples. I also tested with chrome and confirmed that info bubble, app launcher and tab dragging works. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=46374 Review URL: http://codereview.chromium.org/1629024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46439 0039d316-1c4b-4281-b951-d872f2087c98
* Refactors animation to allow for cleaner subclassing. I'm doing thissky@chromium.org2010-05-054-5/+5
| | | | | | | | | | | | for creating a different animation subclass (which you'll see shortly). BUG=none TEST=none Review URL: http://codereview.chromium.org/1961001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46433 0039d316-1c4b-4281-b951-d872f2087c98
* Use GetDisplayStringInLTRDirectionality() in more places to simplify code.pkasting@chromium.org2010-05-051-2/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1928004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46427 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting two files that has been included in revert by mistake.oshima@chromium.org2010-05-042-9/+1
| | | | | | | | | | TBR=sky@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/1941002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46378 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Add transparency to TYPE_CHILD WidgetGtk."oshima@chromium.org2010-05-045-194/+67
| | | | | | | | | | This reverts commit ddbb1a000db9a2e8ea0cb504877c48fd7838da1b. TBR=sky@chromium.org Review URL: http://codereview.chromium.org/1951003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46377 0039d316-1c4b-4281-b951-d872f2087c98
* Add transparency to TYPE_CHILD WidgetGtk.oshima@chromium.org2010-05-043-58/+193
| | | | | | | | | | | | | * This does not work with renderer as parent yet.(I need to investigate renderer what it's doing) * gtk_widget_set_back_pixmap is not necessary and removed. * changed to use clear operation to fill a background with transparent color. BUG=none TEST=manual: added transparent widget example to view_examples. I also tested with chrome and confirmed that info bubble, app launcher and tab dragging works. Review URL: http://codereview.chromium.org/1629024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46374 0039d316-1c4b-4281-b951-d872f2087c98