summaryrefslogtreecommitdiffstats
path: root/chrome
Commit message (Collapse)AuthorAgeFilesLines
* SCons config for recent bookmark changes.sgk@google.com2008-10-303-2/+6
| | | | | | Review URL: http://codereview.chromium.org/8921 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4228 0039d316-1c4b-4281-b951-d872f2087c98
* Roll deps to pull in new third_party/WebKitojan@google.com2008-10-301-1/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4226 0039d316-1c4b-4281-b951-d872f2087c98
* Modified the mini installer tests to work for both Google Chrome and Chromium. anantha@chromium.org2008-10-305-52/+86
| | | | | | Review URL: http://codereview.chromium.org/7944 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4219 0039d316-1c4b-4281-b951-d872f2087c98
* Accumulated SCons changes for Windows chrome build, round II:sgk@google.com2008-10-3016-96/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes other recent additions, and doesn't fix everything, but gets significant pieces back on track: * New/additional library dependencies in various test executables (too many to be worth listing). * Portability: put library base names in $LIBS instead of explicitly listing .lib files. * Have interactive_ui re-use various object files from test/ui instead of (re-)listing the .cc files. * Add new files: chrome\browser\bookmarks\bookmark_drag_data.cc chrome\browser\bookmarks\bookmark_drag_utils.cc chrome\browser\bookmarks\bookmark_table_model.cc chrome\browser\browser_trial.cc chrome\browser\download\download_request_manager_unittest.cc chrome\browser\greasmonkey_master.cc chrome\browser\spellcheck_unittest.cc chrome\browser\views\find_bar_view.cc chrome\browser\views\find_bar_win.cc chrome\renderer\greasemonkey_slave.cc * Remove old files: chrome\browser\find_in_page_controller.cc chrome\browser\find_in_page_view.cc chrome\renderer\spellcheck_unittest.cc * Remove relative reference to ../../app/google_update_settings$OBJSUFFIX. * Get rid of by-hand /IMPLIB and /MAP flags. * Prefix / suffix portability in the jscre library. * Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources. * Add $CHROME_DIR/app/resources to CPPPATH. * Add icu38 directories to CPPPATH for building chrome/views files. Review URL: http://codereview.chromium.org/8742 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4215 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Issue 2918 in chromium: Chrome dialog displayed in large size with ↵hbono@chromium.org2008-10-306-8/+14
| | | | | | | | Meiryo font.This issue is caused by a font whose text metric |tmAveCharWidth| is not precise as noted in Microsoft Knowledge Base 145994 (*1) To handle this case, this change uses the ChromeFont::horizontal_dlus_to_pixels() function instead of the ChromeFont::ave_char_width() function.(*1) http://support.microsoft.com/kb/145994BUG=2918 Review URL: http://codereview.chromium.org/8051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4213 0039d316-1c4b-4281-b951-d872f2087c98
* Makes form resubmission dialog work again. This was a regressionsky@google.com2008-10-308-19/+13
| | | | | | | | | | | introduced during NavigationController refactoring. BUG=2616 TEST=see bug Review URL: http://codereview.chromium.org/8865 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4212 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r4205 to track down buildbot unit_tests failure.sgk@google.com2008-10-3016-109/+96
| | | | | | Review URL: http://codereview.chromium.org/8730 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4206 0039d316-1c4b-4281-b951-d872f2087c98
* Accumulated SCons changes for Windows chrome build and othersgk@google.com2008-10-3016-96/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recent additions (doesn't fix everything, but gets significant pieces back on track). * New/additional library dependencies in various test executables (too many to be worth listing). * Portability: put library base names in $LIBS instead of explicitly listing .lib files. * Have interactive_ui re-use various object files from test/ui instead of (re-)listing the .cc files. * Add new files: chrome\browser\bookmarks\bookmark_drag_data.cc chrome\browser\bookmarks\bookmark_drag_utils.cc chrome\browser\bookmarks\bookmark_table_model.cc chrome\browser\browser_trial.cc chrome\browser\download\download_request_manager_unittest.cc chrome\browser\greasmonkey_master.cc chrome\browser\spellcheck_unittest.cc chrome\browser\views\find_bar_view.cc chrome\browser\views\find_bar_win.cc chrome\renderer\greasemonkey_slave.cc * Remove old files: chrome\browser\find_in_page_controller.cc chrome\browser\find_in_page_view.cc chrome\renderer\spellcheck_unittest.cc * Remove relative reference to ../../app/google_update_settings$OBJSUFFIX. * Get rid of by-hand /IMPLIB and /MAP flags. * Prefix / suffix portability in the jscre library. * Rename $LIBXML_DIR/scons => $LIBXML_DIR/DerivedSources. * Add $CHROME_DIR/app/resources to CPPPATH. * Add icu38 directories to CPPPATH for building chrome/views files. Review URL: http://codereview.chromium.org/8725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4205 0039d316-1c4b-4281-b951-d872f2087c98
* Changes session restore to account for apps and popups. If you havesky@google.com2008-10-3011-81/+182
| | | | | | | | | | | | | | | | | | | | | session restore enabled any time you transition from no tabbed browsers to a tabbed browser (in the same profile) we restore your last session, where the last session was any previously open tabbed browsers. For example, if you start Chrome from an installed app shortcut then create a new tabbed browser (by any means) we'll restore your last session. This gives the illustion that apps are running in their own process. I would love to have test coverage of this, but I'm loathe to write anymore flakey UI tests. Need to revisit post 1.0. BUG=1883 TEST=thoroughly test session restore, especially with application shortcuts and popups. Review URL: http://codereview.chromium.org/8856 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4202 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure titles and bodies of web pages that come into the history system verybrettw@google.com2008-10-305-32/+139
| | | | | | | | | late are indexed. Very slow pages (>20 seconds) would previously not get indexed. BUG=3835 Review URL: http://codereview.chromium.org/8899 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4201 0039d316-1c4b-4281-b951-d872f2087c98
* Remove downloads from the completed dangerous downloads listpaulg@google.com2008-10-301-0/+6
| | | | | | | | | | | | | | | | when they are deleted via "Clear browsing data". There was definite crash a shutdown, and sporadic crashes when idling (but after a dangerous download was complete but not yet confirmed) after a user cleared their browsing data, since the dangerous list kept around a pointer to a download that had been deleted elsewhere. BUG=3498 (http://code.google.com/p/chromium/issues/detail?id=3498) Review URL: http://codereview.chromium.org/8728 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4200 0039d316-1c4b-4281-b951-d872f2087c98
* Add compatible version support since it was only halfway in place, and try ↵pkasting@chromium.org2008-10-3010-55/+97
| | | | | | | | | | | | | and make our database versioning code and logging more similar across various consumers. The compatible version support isn't really used yet. It was going to be used for my cookie change until we decided that the old code was too busted to be forward-compatible. It seems worthwhile to put this in but maybe I am wrong. The logging similarity stuff is fairly useful. In a couple consumers in the old code, we DLOGed instead of LOGing, which meant that most people would get nothing in the log at all. I think it's a little weird that in a lot of these consumers, logging is all we do; for example, if you use a too-new cookie DB, you get output in the log, but no actual dialog box while the browser is running -- your cookies just silently don't get saved to disk. Seems bad, but I'm not prepared to try and do major surgery to address that (and add translated strings, etc.). At least now we'll actually get log messages in release builds instead of nothing at all. Because my last-access change touches this code, I'm considering asking that this change be merged back to the branch. Review URL: http://codereview.chromium.org/8712 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4195 0039d316-1c4b-4281-b951-d872f2087c98
* The strings required for the upcoming autofill UI.jcampan@chromium.org2008-10-301-0/+11
| | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/8714 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4194 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes resizing of single split view for RTL case.sky@google.com2008-10-301-2/+1
| | | | | | | | | BUG=674 TEST=none Review URL: http://codereview.chromium.org/8210 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4193 0039d316-1c4b-4281-b951-d872f2087c98
* Add more UMA collection to the New Tab Pageglen@chromium.org2008-10-293-31/+137
| | | | | | | | BUG=1450986 Review URL: http://codereview.chromium.org/8686 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4192 0039d316-1c4b-4281-b951-d872f2087c98
* First cut at the bookmark manager. There are still a fair number ofsky@google.com2008-10-2937-854/+2934
| | | | | | | | | | | | | | | | | | | | | | | | | rough edges, but I'm at a good point where I want to land what I have. Here's what is left: . Flicker on show, likely the result of restoring window placement. . tree flickers when dragging splitter. . table/tree need to autoscroll when drop cursor held at bottom of view. . prompts for deleting. . When you move an item the table snaps to the top, this is because I'm sending out model changed. need a better notification. . Operations in menu to add need to change selection. . Remember split location. I would have preferred to split this up into a couple of reviews, but everything is intertwined now. Sorry. BUG=674 TEST=don't test the bookmark manager yet, but make sure bookmark bar still works. Review URL: http://codereview.chromium.org/8197 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4191 0039d316-1c4b-4281-b951-d872f2087c98
* Fix more problems with search providers.pkasting@chromium.org2008-10-291-5/+5
| | | | | | | | | | | onet.pl apparently moved their search service out of beta, and changed the URLs accordingly, since the time I put the original list together. In the other two cases, changing encodings to UTF-8 seemed to fix issues with words in the local languages, and who am I to argue with the results. BUG=3804,3809,3816 Review URL: http://codereview.chromium.org/8719 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4190 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing some windows scons build breaks.bradnelson@chromium.org2008-10-294-12/+4
| | | | | | Review URL: http://codereview.chromium.org/8723 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4186 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the dashboard_compatibility_mode member from the WebPreferenceswtc@google.com2008-10-291-2/+0
| | | | | | | | | | structure. The member is no longer used. R=tony,avi BUG=3834 Review URL: http://codereview.chromium.org/8705 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4183 0039d316-1c4b-4281-b951-d872f2087c98
* Fix throb animation - a change to Animation::Start meant that Run() in a ↵glen@chromium.org2008-10-294-6/+14
| | | | | | | | | | derived class was never being called. Throb animation depended on this. BUG=3516 Review URL: http://codereview.chromium.org/8896 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4181 0039d316-1c4b-4281-b951-d872f2087c98
* Only show the language restart warning once, and only if needed.glen@chromium.org2008-10-292-3/+10
| | | | | | | | BUG=2835 Review URL: http://codereview.chromium.org/8195 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4179 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for Save Page downloads not notifying their observers on completion.glen@chromium.org2008-10-291-0/+1
| | | | | | | | BUG=3417 Review URL: http://codereview.chromium.org/8804 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4177 0039d316-1c4b-4281-b951-d872f2087c98
* The SharedMemory is owned by the GreasemonkeyMaster, not the unit test. My ↵evanm@google.com2008-10-291-5/+5
| | | | | | | | | previous attempt at fixing the purify problem was overzealous; I just needed to fix the uninitialized boolean that my previous "fix" did. This change halfway-reverts to before that state. Review URL: http://codereview.chromium.org/8893 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4172 0039d316-1c4b-4281-b951-d872f2087c98
* Free memory in unit test, so purify doesn't complain.evanm@google.com2008-10-292-5/+6
| | | | | | | Review URL: http://codereview.chromium.org/8405 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4163 0039d316-1c4b-4281-b951-d872f2087c98
* Added strings to support Spellchecker operations in the context menu.sidchat@google.com2008-10-291-0/+12
| | | | | | Review URL: http://codereview.chromium.org/8710 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4160 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a couple of tab related bugs:ben@chromium.org2008-10-293-0/+13
| | | | | | | | | | | | - moving the window while a tab is animating to its final resting position disembodies the tab - it's possible to make a tab disappear while clicking on another tab while a tab is animating to its final resting position http://crbug.com/2388 http://crbug.com/1142 Review URL: http://codereview.chromium.org/8689 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4155 0039d316-1c4b-4281-b951-d872f2087c98
* Add command line option to suppress Chrome launch after successful installkuchhal@chromium.org2008-10-297-1066/+1090
| | | | | | | | BUG=1443250 Review URL: http://codereview.chromium.org/8644 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4154 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in BuildComponents to allow things like Defer and publishing.bradnelson@google.com2008-10-291-1/+1
| | | | | | Review URL: http://codereview.chromium.org/8666 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4153 0039d316-1c4b-4281-b951-d872f2087c98
* remove svn:executablekuchhal@chromium.org2008-10-291-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4147 0039d316-1c4b-4281-b951-d872f2087c98
* Trivial patch: add whitespace to some SQL statements to turn "INSERT INTO ↵pkasting@chromium.org2008-10-295-15/+13
| | | | | | | | | foo(bar,baz)VALUES(?,?)" into "INSERT INTO foo (bar, baz) VALUES (?,?)" (which is the way we have it in most of our code). This was annoying me while I tried to track down cases where we omitted the appropriate fieldnames from our SQL statements. Review URL: http://codereview.chromium.org/8855 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4145 0039d316-1c4b-4281-b951-d872f2087c98
* remove svn:executable propertykuchhal@chromium.org2008-10-291-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4143 0039d316-1c4b-4281-b951-d872f2087c98
* remove svn:executable propertykuchhal@chromium.org2008-10-293-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4142 0039d316-1c4b-4281-b951-d872f2087c98
* Add option to disable/enable Spell Check. In addition, remove additional ↵sidchat@google.com2008-10-2913-151/+132
| | | | | | | | | | code in resource message filter, which was initilaizing spellchecker in the filter if it was NULL. This part of the code is not required since the resource message filter should not initialize spellchecker; it is up to the profile to give the spellchecker to the resource message filter. Issue = 120 Review URL: http://codereview.chromium.org/7935 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4140 0039d316-1c4b-4281-b951-d872f2087c98
* Add fieldnames to SQL statements for better forward-compatibility. Had we ↵pkasting@chromium.org2008-10-291-2/+8
| | | | | | | | | had this code in place already, I wouldn't have needed to rev the compatible version number in my upcoming database change >:( I checked the rest of our sourcebase's INSERT and SELECT statements, but these were the only ones that needed to have fieldnames added (in a few cases SELECT * was appropriate). Review URL: http://codereview.chromium.org/8684 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4130 0039d316-1c4b-4281-b951-d872f2087c98
* Adds a string that we'll need when importing bookmarks.sky@google.com2008-10-292-0/+6
| | | | | | | | | BUG=674 TEST=none Review URL: http://codereview.chromium.org/8862 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4124 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a minor memory leak.paulg@google.com2008-10-294-8/+6
| | | | | | | | | BUG=1340229 Review URL: http://codereview.chromium.org/8690 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4117 0039d316-1c4b-4281-b951-d872f2087c98
* The "extra view" used by the DialogClientView must not be retrieved before ↵ben@chromium.org2008-10-292-8/+17
| | | | | | | | | the contents view has been attached to the view hierarchy. http://crbug.com/2751 Review URL: http://codereview.chromium.org/8681 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4116 0039d316-1c4b-4281-b951-d872f2087c98
* Moved the SelfDeletePluginInvokeInSynchronousMouseMove to interactive ui testsananta@chromium.org2008-10-299-40/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | as we need to simulate mousemoves here. ui tests run on machines which are locked, causing this test to fail. Moved the NPAPITester and NPAPIVisiblePluginTester classes to a common file npapi_test_helper.cc so it can be used from both tests. Relanding the SetCursor patch. It has already been approved by John. Description below:- Proposed fix for http://b/issue?id=1362948, which is a crash in the rendererwhen we invoke the setCursor call on the parent view in WebPluginImpl::handleEvent. This crash occurs because the plugin is deleted in the context of a mouse down event. This could occur by invoking a javascript function via NPN_Evaluate. On return from the HandleEvent sync call we attempt to retreive the parent frame, which returns NULL and hence the crash. The fix is to retreive the parent frameview at the start of the WebPluginImpl::handleMouseEvent function and use it whereever needed. Added a unit test which deletes the plugin instance in a mousemove event. R=jam Bug=1362948 Review URL: http://codereview.chromium.org/8691 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4115 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r4094; ui_tests failures in SelfDeletePluginInvokeInSynchronousMouseMove.sgk@google.com2008-10-282-76/+1
| | | | | | Review URL: http://codereview.chromium.org/8861 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4107 0039d316-1c4b-4281-b951-d872f2087c98
* Change our phishing 'learn more' URL to something that will soon be translated.glen@chromium.org2008-10-2842-42/+42
| | | | | | | | BUG=2804 Review URL: http://codereview.chromium.org/8196 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4104 0039d316-1c4b-4281-b951-d872f2087c98
* Fix crbug.com/3684.tim@chromium.org2008-10-282-21/+25
| | | | | | | | | | | | | | | | Change 6053 involved making the PasswordManagerView's table model contain a vector of stack-allocated PasswordRow that owned a heap allocated PasswordForm, but std::vector creates temp PasswordRow's internally (on the stack) that were deleting the PasswordForm in their dtor. This accidental vector-internal delete caused subsequent operations on saved_signons_ to blow up. My fix is to make PasswordRows a vector of heap allocated PasswordRow instead, and have a STLElementDeleter member handle cleanup. Review URL: http://codereview.chromium.org/8651 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4103 0039d316-1c4b-4281-b951-d872f2087c98
* Don't automatically deny subresource requests that have minorwtc@google.com2008-10-282-26/+43
| | | | | | | | | | | | | | | | certificate errors (ERR_CERT_NO_REVOCATION_MECHANISM and ERR_CERT_UNABLE_TO_CHECK_REVOCATION). This requires moving the code that automatically denies subresource requests into only the SSLPolicy subclasses that need it. To avoid duplicating that code in five classes, I added convenience methods for handling overridable certificate errors and fatal errors. R=jcampan,abarth Review URL: http://codereview.chromium.org/8085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4098 0039d316-1c4b-4281-b951-d872f2087c98
* Proposed fix for http://b/issue?id=1362948, which is a crash in the ↵ananta@chromium.org2008-10-282-1/+76
| | | | | | | | | | | | | | rendererwhen we invoke the setCursor call on the parent view in WebPluginImpl::handleEvent. This crash occurs because the plugin is deleted in the context of a mouse down event. This could occur by invoking a javascript function via NPN_Evaluate. On return from the HandleEvent sync call we attempt to retreive the parent frame, which returns NULL and hence the crash. The fix is to retreive the parent frameview at the start of the WebPluginImpl::handleMouseEvent function and use it whereever needed. Added a unit test which deletes the plugin instance in a mousemove event.R=jamBug=1362948 Review URL: http://codereview.chromium.org/8178 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4094 0039d316-1c4b-4281-b951-d872f2087c98
* Fix browser crash when closing popups (issue 3631).finnur@google.com2008-10-281-5/+7
| | | | | | | | The Google Bookmarks bookmarklet opens a popup window that allows you to bookmark a page. When the window closes we crash because we dereference a NULL TabContents pointer the we get from GetSelectedTabContents(). This fixes that. Review URL: http://codereview.chromium.org/8185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4093 0039d316-1c4b-4281-b951-d872f2087c98
* Give the new implementation a unique name for the databasepaulg@google.com2008-10-281-1/+1
| | | | | | | | and filter storage so that it can run side by side with the old implementation without data loss. Review URL: http://codereview.chromium.org/8844 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4087 0039d316-1c4b-4281-b951-d872f2087c98
* Add referrer to session restore.ericroman@google.com2008-10-289-49/+96
| | | | | | | | http://code.google.com/p/chromium/issues/detail?id=3774 Review URL: http://codereview.chromium.org/8649 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4086 0039d316-1c4b-4281-b951-d872f2087c98
* Adds strings needed for the bookmark manager.sky@google.com2008-10-281-0/+18
| | | | | | | | | BUG=3784 TEST=none Review URL: http://codereview.chromium.org/8837 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4083 0039d316-1c4b-4281-b951-d872f2087c98
* No code change. Just to force a build.maruel@chromium.org2008-10-281-4/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4075 0039d316-1c4b-4281-b951-d872f2087c98
* No code change. Just to force a rebuild.maruel@chromium.org2008-10-281-4/+3
| | | | | | Review URL: http://codereview.chromium.org/8667 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4074 0039d316-1c4b-4281-b951-d872f2087c98
* - Make user script loading asynchronous on the file thread.evanm@google.com2008-10-289-44/+385
| | | | | | | | - Automatically reload scripts when the directory changes. - Add a unit test for the GreasemonkeyMaster. Review URL: http://codereview.chromium.org/7472 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4069 0039d316-1c4b-4281-b951-d872f2087c98