summaryrefslogtreecommitdiffstats
path: root/chrome/app
Commit message (Collapse)AuthorAgeFilesLines
* Augment time_format.h/.cc to format elapsed time also.munjal@chromium.org2009-04-161-0/+244
| | | | | | Review URL: http://codereview.chromium.org/67186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13874 0039d316-1c4b-4281-b951-d872f2087c98
* Use tab to group "Show saved passwords" and "Exceptions"hclam@chromium.org2009-04-151-27/+29
| | | | | | | | | | | BUG=9026 "Show saved passwords" and "Exceptions" were splited into 2 dialogs, group together in one single dialog with different pages by tabbing. Review URL: http://codereview.chromium.org/67055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13786 0039d316-1c4b-4281-b951-d872f2087c98
* Make the omnibox popup look nicer. Add dropshadow images (not final). ↵ben@chromium.org2009-04-159-0/+8
| | | | | | | | | | | | Experiment with some effects. Adds a positioner interface that allows the popup to size itself to the width of the edit view + the width of the star and go buttons. (Basically the toolbar needs to help the popup position itself). No results yet! Review URL: http://codereview.chromium.org/68011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13784 0039d316-1c4b-4281-b951-d872f2087c98
* For some Indian locales, the automatic font fallback by Windows UI ↵jungshik@google.com2009-04-1550-2/+121
| | | | | | | | | | | | | | | | | | | | | | | | | components leads to too tiny glyphs for UI strings. Therefore, this patch makes it possible to override the UI font family and UI font size localizable by adding two entries to locale_settings (IDS_UI_FONT_FAMILY and IDS_UI_FONT_SIZE_SCALER - percentile scale). It's is also to fix a P1 bug for Chrome 2.0 final (so this patch needs to be merged back to the branch). For most locales, the UI font family is set to 'default' and the UI font size scaler is set to 100, which indicates that the UI font (menu, message, etc) obtained from Windows will be used. For ml and bn, it's set to the 'kartica' and 'vrinda' (the default Windows fonts for those scripts) and the scaler is set to 150 and 160 respectively. For Hindi and Telugu, only the font size scaler is set to 150. When IDS_UI_FONT_FAMILY is 'default' and the scaler is 100, the behavior will remain the same. When it's not, their values are used to create ChromeFont (base and derived) and WindowsTitle font. In addition, menu will be drawn by 'owner' (to override the windows font) and the font for table view, tree and tooltip is also set to IDS_UI_FONT_FAMILY. While working on this, I replaced all the instances of 'static ChromeFont' with 'static ChromeFont*' and initialized them in a lazy manner. The whole approach is still a hack necessary due to the size issue with the default fonts for some Indic scripts on Windows. We'd not need this on Linux and Mac. TEST=1. Run chrome with '--lang=bn' or '--lang=ml' and see UI strings are legible in menu, context menu, bookmark, bookmark manager, tooltips, and tab titles. With '--lang=hi' and '--lang=te', the difference is not dramatic but should be more readable. In other locales, it should remain the same. 2.UI test in en-US locale should pass. 3. Running UI tests under Purify should not have any new leak. BUG=7319 Review URL: http://codereview.chromium.org/62064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13773 0039d316-1c4b-4281-b951-d872f2087c98
* Few changes to the NTP remove thumbnails:jcampan@chromium.org2009-04-151-6/+10
| | | | | | | | | | | | | | - some minor string changes - there is now a Cancel button next to the Done button to restore the thumbnails removed during the current editing session - link and favico are opacified as well in remove mode - now using a dictionary instead of a list to store the URL blacklist for faster access - now storing URL hashes instead of URLs (for privacy and also because the DictionaryValue breaks down keys on . characters) BUG=None TEST=Make sure removing thumbnails works as expected. Start removing thumbnails then click Cancel, verify that the thumbnails just removed are restored. Review URL: http://codereview.chromium.org/69007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13723 0039d316-1c4b-4281-b951-d872f2087c98
* Add a Cocoa file picker.avi@google.com2009-04-141-0/+264
| | | | | | Review URL: http://codereview.chromium.org/73044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13695 0039d316-1c4b-4281-b951-d872f2087c98
* Rename the new Omnibox resources to follow convention and use underscores. ↵deanm@chromium.org2009-04-146-0/+5
| | | | | | | | | Add these resources to theme_resources.grd. Review URL: http://codereview.chromium.org/73030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13664 0039d316-1c4b-4281-b951-d872f2087c98
* Collapse bookmark bars into a single bar per window, rather than one per tab.pinkerton@chromium.org2009-04-141-41/+5
| | | | | | | | Create a separate controller for the bar. Hide bar when it's not supposed to be visible instead of just allowing it to be covered by content (it's not always covered, which leads to drawing errors). git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13661 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the title of a JavaScript dialog box.tc@google.com2009-04-131-3/+10
| | | | | | | | | | | | | | | | | | Currently, the title of a JavaScript dialog box contains "Alert" regardless of how it's made: whether by alert(), prompt(), or confirm(). "Alert" should be there only when the dialog box is created by alert(). Tested by: unittest, ui_tests, manually BUG=2359 Original patch by yuzo@google.com at http://codereview.chromium.org/67099 Review URL: http://codereview.chromium.org/70002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13636 0039d316-1c4b-4281-b951-d872f2087c98
* Mark "active" on launch; don't want an hour.jrg@chromium.org2009-04-131-0/+3
| | | | | | Review URL: http://codereview.chromium.org/73014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13624 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds some UI to remove most-visited thumbnails from the New Tab Page.jcampan@chromium.org2009-04-135-0/+16
| | | | | | | | | | | | | | | | | | The URL of removed thumbnails is added to a blacklist, which is a user pref. I had to modify the VisitSegmentDatabase::QuerySegmentUsage not to return a fixed number of items, as now we may filter the ones we get back. Note: this adds between 20 and 30ms to the first NTP load on my machine (a 3 to 5% increase). BUG=685 TEST=Open the NTP. Click the 'Edit thumbnails' link. Remove some thumbnails. Press Done. Edit again, use the "Restore removed" link. Review URL: http://codereview.chromium.org/67037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13611 0039d316-1c4b-4281-b951-d872f2087c98
* Make ws2_32.dll delay load againcpu@google.com2009-04-122-2/+2
| | | | | | | | | | | | | | - In r13569 I removed it from delay load in using_libxml.vsprops - Here I put it back in a more logical place BUG=10012 TBR=maruel Review URL: http://codereview.chromium.org/67073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13574 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring; switch the |filter| parameter into something that is more ↵avi@chromium.org2009-04-121-2/+5
| | | | | | | | | | amenable to cross-platform implementation. BUG=9852 Review URL: http://codereview.chromium.org/63093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13573 0039d316-1c4b-4281-b951-d872f2087c98
* Add WS_32.dll to the dependenciescpu@google.com2009-04-121-1/+2
| | | | | | | | | | | | - it was on delayload now needs to go to regular early bind - I want to see the perf hit and fix the build :) TBR=maruel Review URL: http://codereview.chromium.org/71008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13571 0039d316-1c4b-4281-b951-d872f2087c98
* Remvoing ws_32.dll from libxml triggered a improvised explosive devicecpu@google.com2009-04-121-2/+1
| | | | | | | | | | | - Now build is busted. TBR=maruel Review URL: http://codereview.chromium.org/71007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13570 0039d316-1c4b-4281-b951-d872f2087c98
* Remove histogram connection to base classes in stats_counterjar@chromium.org2009-04-101-0/+1
| | | | | | | | | | | | | | | | Now that histograms move data from renderer to browser, there is less reason to connect to stats counters. Stats counters were using shared memory, and now they may plausibly use the histogram's IPC mechanism instead to move data to the browser. The first step is remove the inheritance, and teh next (plausible/future) step would be to implement counters as histograms with only one bucket. r=mbelshe Review URL: http://codereview.chromium.org/66029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13544 0039d316-1c4b-4281-b951-d872f2087c98
* Allow a different omnibox popup to be enabled via the command line ↵ben@chromium.org2009-04-105-0/+0
| | | | | | | | | | | | (--enable-omnibox2). This will allow a views-based omnibox popup conforming to the new spec (stub provided) to be brought up without disturbing ToT UX. Also adds new images from Nicholas. Review URL: http://codereview.chromium.org/67035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13538 0039d316-1c4b-4281-b951-d872f2087c98
* Put a focus ring on the url bar.pinkerton@chromium.org2009-04-091-37/+17
| | | | | | Review URL: http://codereview.chromium.org/67015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13461 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds a confirmation box when closing the browser with in-progress ↵jcampan@chromium.org2009-04-091-0/+11
| | | | | | | | | | downloads. BUG=1028 TEST=Start several bug downloads, close the browser. A dialog shows up to warn you are about to lose the downloads. Try the wait and continue button. Try again with several windows, and in Incognito mode. Review URL: http://codereview.chromium.org/62131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13453 0039d316-1c4b-4281-b951-d872f2087c98
* Flatten down to a single toolbar per window, significantly simplifying the ↵pinkerton@chromium.org2009-04-093-631/+765
| | | | | | | | tab strip as it now no longer needs to forward messages for everything. Created a toolbar controller to encapsulate much of the toolbar logic that was in the tab contents controller. Better parameterized the tab strip controller so that it could switch any view, not just the main window's content view, when switching tabs. Review URL: http://codereview.chromium.org/65011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13441 0039d316-1c4b-4281-b951-d872f2087c98
* Distributor logo and " - App Name" shouldn't be shown on app frame windows.ben@chromium.org2009-04-082-0/+6
| | | | | | | | http://crbug.com/6138 Review URL: http://codereview.chromium.org/62167 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13393 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for invocation over deprecated protocol handlercpu@google.com2009-04-081-28/+8
| | | | | | | | | | | | | - We don't support chromehtml protocol anymore and future installers do not register it - Avoid stale registry entries to invoke us BUG=9860 BUG=9862 Review URL: http://codereview.chromium.org/64003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13384 0039d316-1c4b-4281-b951-d872f2087c98
* posix: make ctl-C work within gdb for dropping to a console.evan@chromium.org2009-04-081-0/+16
| | | | | | | | See comment in commit for gory details. Review URL: http://codereview.chromium.org/53113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13374 0039d316-1c4b-4281-b951-d872f2087c98
* Added restore and add tab to the system menu so that these operationsidanan@chromium.org2009-04-081-0/+3
| | | | | | | | | | can be done from there. BUG=2144 Review URL: http://codereview.chromium.org/62113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13348 0039d316-1c4b-4281-b951-d872f2087c98
* Cloned from 62030arv@chromium.org2009-04-071-0/+4
| | | | | | | | | | | | | | | Add a "Clear All" link to the downloads page. Fixes jankiness of the blue bar in the download page as it loads. Improve rendering time of the downloads page by chunking the number of download items to do before scheduling the timeout. BUG=9033 Review URL: http://codereview.chromium.org/62115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13285 0039d316-1c4b-4281-b951-d872f2087c98
* Disables the download item on the download-shelf when the file is opened.jcampan@chromium.org2009-04-071-1/+4
| | | | | | | | | | | This is to mitigate against multiple clicks when a file takes some time to show anything to the user when opened (typically a setup.exe). By changing the title and disabling the button, we indicate to the user that an action was taken. BUG=7264 TEST=Download a file (image for example). In the download shelf, press the download item. The download item text should change to "Opening..." and it should be disabled (not responsive to clicks/drag and drops). Review URL: http://codereview.chromium.org/58014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13273 0039d316-1c4b-4281-b951-d872f2087c98
* Info.plist key SVNRevision is now, really, the SVNRevision.jrg@chromium.org2009-04-071-6/+1
| | | | | | | | Use CFBundleVersion for the Keystone version (e.g. 172.2.0.0). Review URL: http://codereview.chromium.org/63027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13259 0039d316-1c4b-4281-b951-d872f2087c98
* Make the font family and the font size used in dom UI localizable. This is a ↵jungshik@google.com2009-04-0350-2/+57
| | | | | | | | | | | | | | | | | | | | | | | part 1 of the fix for bug 7319 and will be followed by part 2 for non-DOM UI. For some Indian languages (Malayalam, Bengali and Telugu), we have to use a bigger size and a font family for that script on Windows. This is because Windows' stock fonts for those scripts are smaller than fonts for other scripts at a given size. I removed 'WEB' style in chrome_font.h because it's not used anywhere any more after our switch to the html UI. In addition, IDS_WEB_FONT_FAMILY is recycled to localize the font family (or the list of font families) for html UI. I also back-ported the support for setting 'style.fooBar' property to our copy of Jstemplate (JstProcessor.prototype.jstValues_). BUG=7319 Review URL: http://codereview.chromium.org/57025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13114 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: Add devtools messages into the about:ipc dialog.pfeldman@chromium.org2009-04-032-8/+12
| | | | | | Review URL: http://codereview.chromium.org/60090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13082 0039d316-1c4b-4281-b951-d872f2087c98
* Don't fatal error when GTK fails to load a 64-bit IME.deanm@chromium.org2009-04-021-6/+15
| | | | | | | | | | | | | This prevents crash on startup if you have IMEs configured. Patch from Fumitoshi Ukai. BUG=9643 Review URL: http://codereview.chromium.org/56176 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13011 0039d316-1c4b-4281-b951-d872f2087c98
* Update public FFmpeg header files from r16647 to r18286.scherkus@chromium.org2009-04-021-2/+2
| | | | | | | | This also includes bumping the version of avutil from 49 to 50, which means the generated libs and build files are also updated. Review URL: http://codereview.chromium.org/56129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13003 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the checked-in scons configuration files.sgk@google.com2009-04-014-222/+0
| | | | | | Review URL: http://codereview.chromium.org/53121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12982 0039d316-1c4b-4281-b951-d872f2087c98
* Make Gtk/Gdk/GLib errors/warnings really fatal.phajdan.jr@chromium.org2009-04-011-16/+23
| | | | | | | | | | | | I had to disable RedirectTest because on Linux it triggered Gdk assertion. It was a bug in our logging <-> glib logging glue code that didn't make this test fail earlier. http://crbug.com/9519 Review URL: http://codereview.chromium.org/56072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12947 0039d316-1c4b-4281-b951-d872f2087c98
* * Breakpad on OSX now works with stock Breakpad framwork.jeremy@chromium.org2009-03-302-17/+86
| | | | | | | | | | * We now add all the same Metadata on OS X as we do on Windows. * Made the code for logging URLs in crash dumps a little more x-platform. Remove custom Breakpad hacks so we can use an unmodified version of the Framework. Review URL: http://codereview.chromium.org/55028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12811 0039d316-1c4b-4281-b951-d872f2087c98
* Based on empirical data, push chrome.dll's base address forward.deanm@chromium.org2009-03-301-1/+1
| | | | | | | | | | | | | Since the meat of our code is in a DLL, which is loaded dynamically, parts of the address space are already occupied. Having our DLL rebased from its preferred address means processing relocations, slower startup time, and less effective memory sharing. We don't have enough information to decide on the best address, but hopefully this will be better than what we currently use. Review URL: http://codereview.chromium.org/49051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12782 0039d316-1c4b-4281-b951-d872f2087c98
* Properly fix menu display when using dark system themes.evan@chromium.org2009-03-271-10/+0
| | | | | | | | | The drawing code in the tab strip was modifying the GC, which affected the GC used for drawing menus. Review URL: http://codereview.chromium.org/55022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12713 0039d316-1c4b-4281-b951-d872f2087c98
* Hide StatsTable behind --enable-stats-table.mbelshe@google.com2009-03-271-5/+7
| | | | | | Review URL: http://codereview.chromium.org/49045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12690 0039d316-1c4b-4281-b951-d872f2087c98
* Hook up close button in tabs. Patch from rohitrao@google.com.pinkerton@chromium.org2009-03-271-8/+88
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12656 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes a few GRIT issues:tc@google.com2009-03-272-9/+9
| | | | | | | | | | | | | | - The generated header files had the wrong paths specified in the vcproj files. - Have the .h files generate to a temp file and overwrite the real .h files if they changed from the last run. This prevents recompiling when only a resource is changed. - Change the output file to the .rc file because otherwise the vcproj file would recompile every time because the .h file wasn't changing. Since the .rc file gets written all the time, this isn't a problem. On a side note, you still have to re-link to get the resources in chrome.dll. I imagine if you turn on incremental linking, this would be pretty fast. BUG=7967 Review URL: http://codereview.chromium.org/53028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12630 0039d316-1c4b-4281-b951-d872f2087c98
* First stab at Mac breakpad support.jeremy@chromium.org2009-03-268-11/+139
| | | | | | | | breakpad_mac.mm still needs some work, there's a bunch of scaffolding in there referring to a custom version of Breakpad I've got going locally. Review URL: http://codereview.chromium.org/53075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12553 0039d316-1c4b-4281-b951-d872f2087c98
* Linux UI theming:estade@chromium.org2009-03-251-0/+10
| | | | | | | | | - Improve appearance of menus by setting background to white (matching windows and fitting better with the overall appearance). - Disable user theming of native widgets: since our widgets are a hodge-podge of native and custom-drawn, there's no way we can support user theming. Eventually users will be able to choose a theme for chromium; until then make everything look like chrome. Review URL: http://codereview.chromium.org/49035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12516 0039d316-1c4b-4281-b951-d872f2087c98
* Bookmark menu work. Notes:jrg@chromium.org2009-03-252-7/+6
| | | | | | | | | | | | | - "add bookmark" menu item enable state (e.g. disabled if no windows) - bookmark menus built dynamically (like before) - bookmark menus rebuild when a bookmark is added/removed - bookmark menus take the current browser to where you want to go - works with multiple windows (main window goes to bookmark location) - works with no windows (bookmarks open a new window) Review URL: http://codereview.chromium.org/49005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12501 0039d316-1c4b-4281-b951-d872f2087c98
* Wire the shortcut (Ctrl+Shift+Del) for Clear Browsing Data.finnur@chromium.org2009-03-251-0/+1
| | | | | | | | | | | | | Firefox has had this shortcut for a long time and I am told IE8+ added it as well. In any case, we should match Firefox. BUG=8458 TEST=Press Ctrl+Shift+Del and the Clear Browsing Data dialog should show up. Review URL: http://codereview.chromium.org/42540 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12432 0039d316-1c4b-4281-b951-d872f2087c98
* Add a progress meter to the downloads page.glen@chromium.org2009-03-242-0/+0
| | | | | | | | | | | | | | Add the progress status text indicator code from the old history page. Make 'cancel' visible when paused. More RTL fixes. BUG=8220,8334 Review URL: http://codereview.chromium.org/42550 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12366 0039d316-1c4b-4281-b951-d872f2087c98
* Disable incremental linking of chrome.dll in debug. It fails with 32 bits OS.maruel@chromium.org2009-03-241-0/+1
| | | | | | Review URL: http://codereview.chromium.org/42537 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12354 0039d316-1c4b-4281-b951-d872f2087c98
* Finish hooking up the worker process UI: use the domains of the workers as ↵jam@chromium.org2009-03-241-0/+3
| | | | | | | | | | the title in the task manager, and show an infobar when a page's workers die. I also cleaned up the code in RenderView which creates a window and widget, since when I originally wrote it I wasn't aware of RenderViewHost::FromID. Review URL: http://codereview.chromium.org/45025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12335 0039d316-1c4b-4281-b951-d872f2087c98
* Bug 6474: Rename the Cancel button to Close in Clear Browsing Data.finnur@chromium.org2009-03-211-1/+2
| | | | | | | | | | | | | | | | At one point we changed the Clear Browsing Data dialog to remember the values of the combobox and the checkboxes between runs. Like with the Options dialog, changes you make take effect immediately and as such having a Cancel button is misleading. Therefore, I am proposing we rename it to Close. BUG=6474 TEST=Open Clear Browsing Data dialog. The button should now say Close. Review URL: http://codereview.chromium.org/45019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12248 0039d316-1c4b-4281-b951-d872f2087c98
* Adds a bookmark menu. This is experimental. To turn on you needsky@google.com2009-03-202-0/+1
| | | | | | | | | | | | --bookmark-menu. BUG=3206 TEST=Turn on the bookmark menu via --bookmark-menu and make sure it works. Also make sure I didn't break anything on the bookmark bar. Review URL: http://codereview.chromium.org/42460 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12217 0039d316-1c4b-4281-b951-d872f2087c98
* Implement focusing location bar with cmd-L on mac. Removes some more ↵pinkerton@chromium.org2009-03-191-4/+30
| | | | | | platform ifdefs that are no longer necessary in Browser. Patch from thakis@google.com. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12155 0039d316-1c4b-4281-b951-d872f2087c98
* Stage 1 of tab dragging infrastructure, disabled. Put in a base class below ↵pinkerton@chromium.org2009-03-191-1/+1
| | | | | | | | the browser window for windows with tabs to promote re-use in contexts other than just the browser. Add code to the tab view to track drags, but it's disabled as it still needs much work. Review URL: http://codereview.chromium.org/42397 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12125 0039d316-1c4b-4281-b951-d872f2087c98