summaryrefslogtreecommitdiffstats
path: root/ash
Commit message (Collapse)AuthorAgeFilesLines
* ash: Take the 24h clock pref into consideration when showing the time.sadrul@chromium.org2012-03-147-10/+59
| | | | | | | | | | R=ben@chromium.org BUG=117682 TEST=none Review URL: https://chromiumcodereview.appspot.com/9702024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126672 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Update the volume icon when audio is muted/unmuted.sadrul@chromium.org2012-03-141-0/+4
| | | | | | | | | | R=ben@chromium.org BUG=118116 TEST=none Review URL: https://chromiumcodereview.appspot.com/9706007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126671 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Update app list UI to match latest crwm.xiyuan@chromium.org2012-03-148-134/+165
| | | | | | | | | | | | | | | | - Tile app list item horizontally; - Move item title to the bottom; - Update padding for model view: 45px from left/right and 32px from top/bottom; - Change shade from 0.4 black to 0.2 black; - Update animation; - Defer app list widget activation until showing animation is finished; BUG=117238,117073 TEST=Verify fix for issue 117238. Review URL: https://chromiumcodereview.appspot.com/9677065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126665 0039d316-1c4b-4281-b951-d872f2087c98
* Set tooltip text to launcher buttons.mukai@chromium.org2012-03-147-7/+16
| | | | | | | | | | BUG=117292 TEST=manually Review URL: http://codereview.chromium.org/9691037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126647 0039d316-1c4b-4281-b951-d872f2087c98
* Adds support for minimizing a window.sky@chromium.org2012-03-148-8/+129
| | | | | | | | | | TEST=none BUG=116213 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9701011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126642 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Update includes to point to canvas.h instead of canvas_skia.htfarina@chromium.org2012-03-142-3/+2
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9702009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126639 0039d316-1c4b-4281-b951-d872f2087c98
* Replace Shell::GetRootWindow with Window::GetRootWindowoshima@chromium.org2012-03-1417-423/+50
| | | | | | | | | | | | | | where this makes sense. I didn't change the class that is potentially global and not root specific. This also removes ToplevelLayoutManager that is not longer in use. BUG=115510 TEST=none Review URL: https://chromiumcodereview.appspot.com/9665016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126590 0039d316-1c4b-4281-b951-d872f2087c98
* Always look for a transient child from the activatable window.stevenjb@chromium.org2012-03-144-26/+77
| | | | | | | | | | | | Re-upload of http://codereview.chromium.org/9635003 BUG=114546 TEST=See issue. Also ensure that behavior is expected with multiple windows open, including multiple windows with modal dialogs. Review URL: http://codereview.chromium.org/9694050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126565 0039d316-1c4b-4281-b951-d872f2087c98
* Reland 126256:zork@chromium.org2012-03-148-24/+71
| | | | | | | | | | | | | Show a different icon in the launcher for incognito windows TBR=sky@chromium.org BUG=116932 TEST=Open an incognito window and a normal window. Check that the icons are different Review URL: http://codereview.chromium.org/9691027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126557 0039d316-1c4b-4281-b951-d872f2087c98
* Reland: Ash: Allow resize along 1 pixel edge inside window contentjamescook@chromium.org2012-03-146-24/+43
| | | | | | | | | | | | | | | The mocks call for resize handles to function along a single pixel edge inside the window, overlapping the web content. Refactored aura::Window::set_hit_test_bounds_inset() into SetHitTestBoundsOverride() to make hover/click events along that border pass through to the non-client area of the window frames. This also allows windows to be resized when they are flush against the top/left/right edges of the screen. BUG=117542 TEST=aura_shell_unittests ShelfLayoutManager, manually resize window from left/right/bottom/top edges Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=126539 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=126544 Review URL: https://chromiumcodereview.appspot.com/9694012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126554 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 126539 - Ash: Allow resize along 1 pixel edge inside window contentjamescook@chromium.org2012-03-146-44/+25
| | | | | | | | | | | | | | | Mocks call for resize handles to function along a single pixel edge inside the window, overlapping the web content. Use the aura::Window::set_hit_test_bounds_inset() functionality to make hover/click events along that border pass through to the non-client area of the window frames. This also allows windows to be resized when they are flush against the top/left/right edges of the screen. BUG=117542 TEST=aura_shell_unittests ShelfLayoutManager, manually resize window from left/right/bottom/top edges Review URL: http://codereview.chromium.org/9694012 TBR=jamescook@chromium.org Review URL: https://chromiumcodereview.appspot.com/9705011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126544 0039d316-1c4b-4281-b951-d872f2087c98
* Ash: Allow resize along 1 pixel edge inside window contentjamescook@chromium.org2012-03-146-25/+44
| | | | | | | | | | | | Mocks call for resize handles to function along a single pixel edge inside the window, overlapping the web content. Use the aura::Window::set_hit_test_bounds_inset() functionality to make hover/click events along that border pass through to the non-client area of the window frames. This also allows windows to be resized when they are flush against the top/left/right edges of the screen. BUG=117542 TEST=aura_shell_unittests ShelfLayoutManager, manually resize window from left/right/bottom/top edges Review URL: http://codereview.chromium.org/9694012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126539 0039d316-1c4b-4281-b951-d872f2087c98
* ash uber tray: Add an update indicator in the popup.sadrul@chromium.org2012-03-148-25/+164
| | | | | | | | | BUG=110130, 115357 TEST=none Review URL: https://chromiumcodereview.appspot.com/9694049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126524 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Get rid of CanvasSkia::GetSkCanvas() function.tfarina@chromium.org2012-03-133-5/+5
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9663077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126495 0039d316-1c4b-4281-b951-d872f2087c98
* Recommit r125950, which was reverted by r125958 due to link failures on ↵erg@chromium.org2012-03-1317-26/+223
| | | | | | | | | | | | | | | win_aura bot. Aura/Ash split: Move ScreenAura to aura::RootWindowScreen. What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell. BUG=116458 First Review URL: http://codereview.chromium.org/9616045 Review URL: http://codereview.chromium.org/9696008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126464 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 126444 - Always look for a transient child from the activatable window.stevenjb@google.com2012-03-132-55/+11
| | | | | | | | | | | | | BUG=114546 TEST=See issue. Also ensure that behavior is expected with multiple windows open, including multiple windows with modal dialogs. Review URL: http://codereview.chromium.org/9635003 TBR=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/9692060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126452 0039d316-1c4b-4281-b951-d872f2087c98
* Add FaviconBitmapHandler, request large icons for the launcher.stevenjb@chromium.org2012-03-133-8/+11
| | | | | | | | | | BUG=110143 TEST=Test favicons thoroughly in general + favicons for aura panels Review URL: http://codereview.chromium.org/9618023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126448 0039d316-1c4b-4281-b951-d872f2087c98
* Always look for a transient child from the activatable window.stevenjb@chromium.org2012-03-132-11/+55
| | | | | | | | | | BUG=114546 TEST=See issue. Also ensure that behavior is expected with multiple windows open, including multiple windows with modal dialogs. Review URL: http://codereview.chromium.org/9635003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126444 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 126319 - Enable user change background image in settings page in Aura ↵sky@chromium.org2012-03-1311-275/+48
| | | | | | | | | | | | | | | | | | build. Only support change between default background images currently. Need more refactor work on code. BUG=105508 TEST= Review URL: http://codereview.chromium.org/9580023 TBR=bshe@chromium.org Review URL: https://chromiumcodereview.appspot.com/9695033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126328 0039d316-1c4b-4281-b951-d872f2087c98
* Add placeholder translations for ash_stringszork@chromium.org2012-03-1353-2/+261
| | | | | | | | | | | TBR=sky@chromium.org BUG=chromium-os:25682 TEST=None Review URL: http://codereview.chromium.org/9689040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126326 0039d316-1c4b-4281-b951-d872f2087c98
* Makes dragging to the left/right edge resize the window to half thesky@chromium.org2012-03-137-40/+309
| | | | | | | | | | | | screen size. TEST=none BUG=116213 R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9691012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126321 0039d316-1c4b-4281-b951-d872f2087c98
* Enable user change background image in settings page in Aura build.bshe@chromium.org2012-03-1311-48/+275
| | | | | | | | | | | | | Only support change between default background images currently. Need more refactor work on code. BUG=105508 TEST= Review URL: http://codereview.chromium.org/9580023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126319 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Add keyboard support to app list.xiyuan@chromium.org2012-03-134-17/+152
| | | | | | | | | | | | - Make AppListModelView focusable; - Arrow keys to navigate around app list; BUG=117070 TEST=Verify arrow keys could move around in app list. Review URL: http://codereview.chromium.org/9664075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126279 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 126256 - Show a different icon in the launcher for incognito windowsisherman@chromium.org2012-03-127-69/+23
| | | | | | | | | | | | BUG=116932 TEST=Open an incognito window and a normal window. Check that the icons are different Review URL: https://chromiumcodereview.appspot.com/9649013 TBR=zork@chromium.org Review URL: https://chromiumcodereview.appspot.com/9692021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126260 0039d316-1c4b-4281-b951-d872f2087c98
* Show a different icon in the launcher for incognito windowszork@chromium.org2012-03-127-23/+69
| | | | | | | | | BUG=116932 TEST=Open an incognito window and a normal window. Check that the icons are different Review URL: https://chromiumcodereview.appspot.com/9649013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126256 0039d316-1c4b-4281-b951-d872f2087c98
* Basic skeleton of a window/layer/view inspector.ben@chromium.org2012-03-126-0/+14
| | | | | | | | | | Ctrl+Shift+F1 brings it up. http://crbug.com/97266 TEST=none Review URL: https://chromiumcodereview.appspot.com/9662022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126207 0039d316-1c4b-4281-b951-d872f2087c98
* ash: It should not be possible to change date settings in the login screen.sadrul@chromium.org2012-03-121-1/+2
| | | | | | | | | BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9663060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126149 0039d316-1c4b-4281-b951-d872f2087c98
* Reland 125850 - Aura: Throttle resize to ability to drawbacker@chromium.org2012-03-122-0/+30
| | | | | | | | | | | | | At the root_window.cc level we defer mouse events triggering a resize while a draw is pending. We are careful to keep the sequence of different event types the same. But we aggregate synthetic mouse moves and mouse drags wwhere possible. In RWHVA, we ask the root window to throttle the resize if we are waiting on the GPU process for a new image. The net result is that UI can only be one frame ahead of the tab contents that are being resized. BUG=58782 TEST=goto google.com with --force-compositing-mode; resize the window by stretching to the right; see very little gap between tab contents and window frame Review URL: https://chromiumcodereview.appspot.com/9662020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126132 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Make the tray accessible.sadrul@chromium.org2012-03-122-0/+14
| | | | | | | | | | | With this change, you can press the hotkey (ctrl-f2) to reach the status-tray with the keyboard, and press space or enter to trigger the popup. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9668032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126106 0039d316-1c4b-4281-b951-d872f2087c98
* views: Nuke is_mouse_gesture parameter from ↵tfarina@chromium.org2012-03-116-15/+9
| | | | | | | | | | | ContextMenuController::ShowContextMenuForView(). BUG=117092 R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9665008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126081 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Get rid of CanvasSkia::AsCanvasSkia() function.tfarina@chromium.org2012-03-111-3/+1
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9662034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126074 0039d316-1c4b-4281-b951-d872f2087c98
* Fix new leak in LauncherButtondavemoore@chromium.org2012-03-101-0/+2
| | | | | | | | | | | | Fixes http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20UI%20%28valgrind%29%288%29/builds/1350/steps/memory%20test%3A%20unit/logs/A101C11CC97B99B5 BUG=None TEST=None TBR=sky Review URL: https://chromiumcodereview.appspot.com/9663041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126044 0039d316-1c4b-4281-b951-d872f2087c98
* Redue use of Shell::GetRootWindowoshima@chromium.org2012-03-101-2/+3
| | | | | | | | | BUG=115510 TEST=none Review URL: https://chromiumcodereview.appspot.com/9664010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125963 0039d316-1c4b-4281-b951-d872f2087c98
* Show which apps are currently running with an underlinedavemoore@chromium.org2012-03-1012-305/+426
| | | | | | | | | BUG=115650 TEST=None Review URL: https://chromiumcodereview.appspot.com/9633005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125960 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 125950 - Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.isherman@chromium.org2012-03-1017-223/+26
| | | | | | | | | | | | | | What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell. BUG=116458 Review URL: http://codereview.chromium.org/9616045 TBR=erg@chromium.org Review URL: https://chromiumcodereview.appspot.com/9667017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125958 0039d316-1c4b-4281-b951-d872f2087c98
* Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.erg@chromium.org2012-03-1017-26/+223
| | | | | | | | | | | What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell. BUG=116458 Review URL: http://codereview.chromium.org/9616045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125950 0039d316-1c4b-4281-b951-d872f2087c98
* ash uber tray: Add an entry for network.sadrul@chromium.org2012-03-107-1/+220
| | | | | | | | | BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9600062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125948 0039d316-1c4b-4281-b951-d872f2087c98
* Ash: Ensure windows have a minimum sizejamescook@chromium.org2012-03-094-3/+32
| | | | | | | | | | | This also fixes DCHECKs when you resize the windows too small. BUG=116872 TEST=manual, resize a browser window to the smallest size possible, can see a tab, can see frame controls Review URL: https://chromiumcodereview.appspot.com/9669008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125912 0039d316-1c4b-4281-b951-d872f2087c98
* Ash: Correctly initialize transparency flag for windowsjamescook@chromium.org2012-03-091-0/+4
| | | | | | | | | | | Widgets of TYPE_WINDOW have potentially transparent frames on Ash. I was initializing the transparency flag in the wrong place, leading to a subset of dialogs (edit bookmark, app shortcut, restart chrome, etc.) having black pixels at their outside corners and the wrong appearance in the inactive state. Inspection of the Widget::CreateWindow* callers suggests this is the right place to put this. BUG=117411 TEST=visual inspection of bookmark windows Review URL: https://chromiumcodereview.appspot.com/9653011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125894 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Do not activate volume/bubble popups, and fix a crash.sadrul@chromium.org2012-03-096-15/+34
| | | | | | | | | | | When volume/brightness is changed from the keyboard (or by other means), the popup that shows up should not be activated/focused. Also, when a volume popup shows up to replace a brightness popup (or vice versa), it should not crash. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9669002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125885 0039d316-1c4b-4281-b951-d872f2087c98
* Wires up using images in multi window resize controller.sky@chromium.org2012-03-091-10/+13
| | | | | | | | | | BUG=116079 TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9648013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125800 0039d316-1c4b-4281-b951-d872f2087c98
* Adds an outline beneath the current window as you drag it around tosky@chromium.org2012-03-095-21/+289
| | | | | | | | | | | | | give an indication as to where on the grid the window will land when dropped. BUG=116213 TEST=none R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9646007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125799 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes possible crash in window resizing code. The problem is changingsky@chromium.org2012-03-091-3/+4
| | | | | | | | | | | | | the bounds can trigger mouse moved, which can trigger attempting to cancel a tab dragging operation thereby destroying the resizer. BUG=none TEST=none R=jennyz@chromium.org Review URL: https://chromiumcodereview.appspot.com/9648016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125796 0039d316-1c4b-4281-b951-d872f2087c98
* Separate the global accelerator data from accelerator_controller.ccmazda@chromium.org2012-03-094-115/+153
| | | | | | | | | | | | I would like to use this data from the keyboard overlay. BUG=117365 TEST=Manually checked the global shortcuts work as before. Review URL: http://codereview.chromium.org/9632022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125793 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Make sure the uber-tray extends to the right and bottom edges of the ↵sadrul@chromium.org2012-03-094-15/+28
| | | | | | | | | | | | | screen. This makes the bottom-right corner a click target for the tray. want. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9633008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125782 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes ash_shell crashes when resizing window to its minimum sizepkotwicz@chromium.org2012-03-099-591/+4
| | | | | | | | | Bug=117086 Test=None Review URL: http://codereview.chromium.org/9625018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125772 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.tfarina@chromium.org2012-03-091-2/+2
| | | | | | | | | | | | The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 R=ben@chromium.org,asvitkine@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Fix unlocking screen after locking when using the uber-tray.sadrul@chromium.org2012-03-083-3/+3
| | | | | | | | | | | | | | | | | | | The tray-delegate has a LockScreen function that is used to lock the screen. It turns out, PowerManagerClient::Observer has an observer callback, also called LockScreen, which gets called when the screen is locked. As a result, when the user locks the screen, the observer's LockScreen gets called again, and it falls into a cycle. In short, you dawg, I heard you like to lock your screen, so I locked your screen while I tell you that I locked your screen. Renamed to RequestLockScreen to avoid the collision. BUG=110130 TEST=none Review URL: https://chromiumcodereview.appspot.com/9649008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125724 0039d316-1c4b-4281-b951-d872f2087c98
* Ash: Constrained windows use new framesjamescook@chromium.org2012-03-083-7/+6
| | | | | | | | | BUG=117101 TEST=Turn off cookies, go to popuptest.com, open cookie management dialog, verify it has new frames Review URL: https://chromiumcodereview.appspot.com/9649002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125676 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Remove string and command_line includes from ash_switches.cctfarina@chromium.org2012-03-081-4/+0
| | | | | | | | R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9653003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125672 0039d316-1c4b-4281-b951-d872f2087c98