It was actually me. My revert is already in. (I had resolved my merge conflict with your change poorly) Erik
On Mon, Oct 5, 2009 at 3:16 PM, John Gregg <[email protected]> wrote: > Looks like a merge problem with my recent change to render_messages.h > regarding WebPreferences. I can submit a fix. -John > > On Mon, Oct 5, 2009 at 3:03 PM, <[email protected]> wrote: > >> http://build.chromium.org/buildbot/waterfall/ >> >> Automatically closing tree for "compile" on "Linux Builder (Views dbg)" >> >> >> http://build.chromium.org/buildbot/waterfall/builders/Linux%20Builder%20%28Views%20dbg%29/builds/1824 >> >> Revision: 28053, 28054 >> Blame list: [email protected],[email protected] >> >> Linux Builder (Views dbg) >> Build >> 1824<http://build.chromium.org/buildbot/waterfall/builders/Linux%20Builder%20%28Views%20dbg%29/builds/1824> >> update >> scripts >> stdio<http://build.chromium.org/buildbot/waterfall/builders/Linux%20Builder%20%28Views%20dbg%29/builds/1824/steps/shell/logs/stdio> >> update >> stdio<http://build.chromium.org/buildbot/waterfall/builders/Linux%20Builder%20%28Views%20dbg%29/builds/1824/steps/gclient/logs/stdio> >> compile >> failed >> stdio<http://build.chromium.org/buildbot/waterfall/builders/Linux%20Builder%20%28Views%20dbg%29/builds/1824/steps/compile/logs/stdio> >> >> Changed by: *[email protected]* >> Changed at: *Mon 05 Oct 2009 15:00:08* >> Branch: *src* >> Revision: *28053* >> >> Changed files: >> >> - *chrome/browser/extensions/extension_host.cc* >> - *chrome/browser/views/browser_bubble_win.cc* >> - *chrome/browser/extensions/extension_host.h* >> - *chrome/common/render_messages.h* >> - *chrome/test/data/extensions/samples/set_page_color/popup.html* >> >> Comments: >> >> Allow popups to close themselves with window.close(). >> >> This also fixes an issue where not all of the parts of WebPreferences were >> being serialized/deserialized across IPC. >> >> BUG=23832 >> TEST=run set_page_color extension, when it sets the color, the popup >> should close >> >> Review URL: http://codereview.chromium.org/243096 >> >> Changed by: *[email protected]* >> Changed at: *Mon 05 Oct 2009 15:00:18* >> Branch: *src* >> Revision: *28054* >> >> Changed files: >> >> - *chrome/app/generated_resources.grd* >> >> Comments: >> >> Landing a patch (http://codereview.chromium.org/249054) from an external >> contributor (Thiago Farina). Description from original changelist: >> >> Add ellipses to |Add| and |Edit| buttons of Search engine manager(keyword >> view), since they opens another window and >> does not, for example, add or edit the selected item. >> >> BUG=16380 >> TEST=Open the search engine manager and see if the |Add| and the |Edit| >> button has the "..." in the end. >> >> Review URL: http://codereview.chromium.org/257053 >> >> >> >> >> >> > --~--~---------~--~----~------------~-------~--~----~ Chromium Developers mailing list: [email protected] View archives, change email options, or unsubscribe: http://groups.google.com/group/chromium-dev -~----------~----~----~----~------~----~------~--~---
