summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Linux Sandbox: forward declare Errorcode in sandbox_bpf_policy_forward.hjln@chromium.org2013-07-102-2/+4
| | | | | | | | | | | | | sandbox_bpf_policy_forward.h can forward declare ErrorCode. This should fix a Chromium on MIPS compilation issue. BUG=130022 NOTRY=true R=markus@chromium.org Review URL: https://codereview.chromium.org/18943004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210691 0039d316-1c4b-4281-b951-d872f2087c98
* cc: Include ContentsOpaque flag in tree dump json output.tfarina@chromium.org2013-07-102-2/+6
| | | | | | | | | BUG=174079 R=danakj@chromium.org Review URL: https://codereview.chromium.org/18950003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210685 0039d316-1c4b-4281-b951-d872f2087c98
* Ensure that the suggested file name is passed to Windows 8 Chrome ASH when ↵ananta@chromium.org2013-07-104-14/+21
| | | | | | | | | | | | | | | | | the save as operation is invoked. The suggested file name is actually the path of the file. We need to get the name from there and display it in the file save picker. This is done in the metro driver in the SaveFilePickerSession::StartFilePicker function. cpu, please review everything. sky, for owners review in ui\aura. BUG=256424 R=cpu@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/18943003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210684 0039d316-1c4b-4281-b951-d872f2087c98
* Add projection touch HUD to keyboard overlaymohsen@chromium.org2013-07-104-1/+7
| | | | | | | | | | | | The shortcut for projection touch HUD is now shown on the keyboard overlay (Ctrl+Alt+/). Also, the shortcut itself was wrongly set to Ctrl+Alt+9 which is now changed to Ctrl+Shift+9. BUG=233567 Review URL: https://chromiumcodereview.appspot.com/18344016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210683 0039d316-1c4b-4281-b951-d872f2087c98
* Fix memory leak of NaClBrowserDelegateImpl.yael.aharon@intel.com2013-07-102-7/+5
| | | | | | | | | | | NaClBrowser is deleted by the AtExitManager and it should delete the delegate automatically. Make NaClBrowserDelegate a scoped_ptr so that it can be deleted automatically with NaClBrowser. BUG=258466 Review URL: https://chromiumcodereview.appspot.com/18356010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210682 0039d316-1c4b-4281-b951-d872f2087c98
* Add a feature where folders can be dragged onto the chrome://extensions page ↵DHNishi@gmail.com2013-07-103-14/+37
| | | | | | | | | | to install unpacked extensions. BUG=181384 Review URL: https://chromiumcodereview.appspot.com/18345019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210681 0039d316-1c4b-4281-b951-d872f2087c98
* Moving app launcher promo metrics to the right place.mad@chromium.org2013-07-103-23/+12
| | | | | | | | BUG=252702 Review URL: https://chromiumcodereview.appspot.com/18341019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210680 0039d316-1c4b-4281-b951-d872f2087c98
* Add images for my upcoming changelist (so I can test using the try servers).finnur@chromium.org2013-07-102-0/+0
| | | | | | | | | BUG=70422 TBR=joi@chromium.org Review URL: https://codereview.chromium.org/18655011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210679 0039d316-1c4b-4281-b951-d872f2087c98
* Update ManagedUserService tests to create the service using ↵ibraaaa@google.com2013-07-103-31/+47
| | | | | | | | | | | | | | | | ManagedUserServiceFactory Using ManagedUserServiceFactory to create the service instead of directly constructing the service allow for correct shutdown (Shutdown method to be called) To prevent this from happening again we: 1- We DCHECK that Shutdown method is called before destruction of ManagedUserService 2- We make the constructor of ManagedUserService accessible only to ManagedUserServiceFactory BUG=None Review URL: https://chromiumcodereview.appspot.com/18337013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210677 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up base/debug/stack_trace_android.cc.scherkus@chromium.org2013-07-101-32/+19
| | | | | | | | | | | | It's looking like we'll be sticking with <unwind.h> for the forseeable future. Clean up the code to match Chromium style and remove TODOs relating to switching away from <unwind.h>. BUG=236855 Review URL: https://chromiumcodereview.appspot.com/18337008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210676 0039d316-1c4b-4281-b951-d872f2087c98
* Skip desktop checks (including flash_path) on chromeos.achuith@chromium.org2013-07-103-14/+22
| | | | | | | | | | BUG=NONE TEST=manual NOTRY=True Review URL: https://chromiumcodereview.appspot.com/18324016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210675 0039d316-1c4b-4281-b951-d872f2087c98
* Add Delegated Renderer (aka Übercompositor) to about:flagspiman@chromium.org2013-07-107-1/+33
| | | | | | | | BUG=123444 Review URL: https://chromiumcodereview.appspot.com/18292015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210674 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring of the activity logging end to tests. They now check the correct ↵karenlees@chromium.org2013-07-0911-724/+1036
| | | | | | | | | | | | | | functions are logged. If you think this caused any test flakiness issues please ping karenlees and felt. BUG=256756,245594 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210475 Review URL: https://chromiumcodereview.appspot.com/18272007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210672 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanups to the activity log WebRequest codemvrable@chromium.org2013-07-091-7/+5
| | | | | | | | | | Track object ownership more explicitly by using scoped_ptr; I hadn't known about bind::Passed for passing scoped_ptrs to callbacks when writing the code originally. Review URL: https://chromiumcodereview.appspot.com/18132018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210671 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Android touch event queuingjdduke@chromium.org2013-07-094-5/+94
| | | | | | | | | | | | | | | Chrome on Android maintains a touch event queue separate from the common TouchEventQueue. This patch resolves two touch-related issues arising from the use of this separate queue. In particular, touch events queued during a TouchEventQueue touch ack are no longer sent to the renderer twice, and touch events are no longer coalesced when there is but one touch event in the Android touch event queue. BUG=257144,257153,256943 Review URL: https://chromiumcodereview.appspot.com/18061006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210670 0039d316-1c4b-4281-b951-d872f2087c98
* Switch Android ProfileSyncService to OAuth2pavely@chromium.org2013-07-0913-267/+213
| | | | | | | | BUG=226469 Review URL: https://chromiumcodereview.appspot.com/17628003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210669 0039d316-1c4b-4281-b951-d872f2087c98
* See if screen grab works with vangelis's hack or kvmzmo@chromium.org2013-07-091-4/+0
| | | | | | | | | | | | | | Right now gpulin1 has vangelis's dongle, and gpulin2 is connected with a kvm. Turning the pixe tests back on linux nvidia, and see if either works. BUG=255146 TEST=gpu linux bots, pixel tests TBR=kbr@chromium.org,vangelis@chromium.org Review URL: https://codereview.chromium.org/18166005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210668 0039d316-1c4b-4281-b951-d872f2087c98
* Added screenshot showing UI when Identity API is used to authenticate a ↵awatson@chromium.org2013-07-092-9/+15
| | | | | | | | | | | | | | Google account. BUG= STAGED DOC: https://chrome-apps-doc.appspot.com/_patch/18233023/apps/app_identity.html R=courage@chromium.org, kalman@chromium.org Review URL: https://codereview.chromium.org/18233023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210667 0039d316-1c4b-4281-b951-d872f2087c98
* Avoid forwarding the test HTTP port twice.joaodasilva@chromium.org2013-07-091-10/+1
| | | | | | | | | | | | base_test_runner.BaseTestRunner already forwards port 8000; avoid doing that again in instrumentation.test_runner.TestRunner again, which confuses the forwarder. BUG=242846 Review URL: https://chromiumcodereview.appspot.com/18854020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210666 0039d316-1c4b-4281-b951-d872f2087c98
* Pepper: Route CreateResourceHostFromHostReply.teravest@chromium.org2013-07-094-15/+21
| | | | | | | | | | | | | | | Reply messages from the browser to the renderer must be routed so that they end up in the correct RenderView (and eventually the PepperBrowserConnection object). This change makes PpapiHostMsg_CreateResourceHostFromHostReply consistent with PpapiHostMsg_FileRef_GetInfoForRendererReply. BUG=225441 Review URL: https://chromiumcodereview.appspot.com/18826011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210665 0039d316-1c4b-4281-b951-d872f2087c98
* Only read WebRTC log list file if exists.grunell@chromium.org2013-07-092-16/+22
| | | | | | | | BUG=254329 Review URL: https://chromiumcodereview.appspot.com/18819002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210664 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Use dbus::PopDataAsValue to initialize DiskInfohashimoto@chromium.org2013-07-091-90/+50
| | | | | | | | | BUG=None TEST=chromeos_unittests Review URL: https://chromiumcodereview.appspot.com/18815003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210663 0039d316-1c4b-4281-b951-d872f2087c98
* Add correct assets for autofill proxy cards (for dogfood).estade@chromium.org2013-07-092-0/+0
| | | | | | | | | BUG=243571 TBR=sail@chromium.org Review URL: https://codereview.chromium.org/18340007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210661 0039d316-1c4b-4281-b951-d872f2087c98
* fix in-app-payment png +x bit, TBR=ajwong@chromium.orgscottmg@chromium.org2013-07-093-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210657 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 210649 "Base: Disable the scoped handle verifier."rvargas@google.com2013-07-091-1/+1
| | | | | | | | | | | | | | | | | | > Base: Disable the scoped handle verifier. > > This is intended for the M29 beta branch. > > BUG=258498 > TEST=none > TBR=cpu@chromium.org > > Review URL: https://codereview.chromium.org/18854022 TBR=rvargas@google.com Review URL: https://codereview.chromium.org/18955002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210656 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-07-091-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210653 0039d316-1c4b-4281-b951-d872f2087c98
* about:nacl WebUI: Force revalidation of PNaCl path on each request.jvoung@google.com2013-07-091-0/+4
| | | | | | | | | | | | | | Force revalidation on each request, in case PNaCl had gone from the not-installed to installed state since the last web UI page load. Without this, the "Reload this page" button will submit a request, but the page will show stale information. BUG=258531 R=jhawkins@chromium.org Review URL: https://codereview.chromium.org/18928002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210652 0039d316-1c4b-4281-b951-d872f2087c98
* Avoid std::string copying in GetFileNameInWhitelist.jorgelo@chromium.org2013-07-091-7/+12
| | | | | | | | | | | BUG=256452 TEST=sandbox_linux_unittests passes. TEST=about:gpu shows "Sandboxed: true", browser works. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/18337010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210651 0039d316-1c4b-4281-b951-d872f2087c98
* make it possible to disable internal tracing in unofficial buildsmostynb@opera.com2013-07-092-2/+19
| | | | | | | | | Add a tracing_like_official_build gyp setting, which works similarly to the logging_like_official_build setting. Review URL: https://chromiumcodereview.appspot.com/18333010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210650 0039d316-1c4b-4281-b951-d872f2087c98
* Base: Disable the scoped handle verifier.rvargas@google.com2013-07-091-1/+1
| | | | | | | | | | | | This is intended for the M28 beta branch. BUG=258498 TEST=none TBR=cpu@chromium.org Review URL: https://codereview.chromium.org/18854022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210649 0039d316-1c4b-4281-b951-d872f2087c98
* InstantExtended: linux port!samarth@chromium.org2013-07-096-2/+93
| | | | | | | | | | | | | | | | This patch contains a minimal set of changes to make InstantExtended functional in Linux: (1) Communicate omnibox bounds to Instant. (2) Implement invisible focus in the omnibox. (3) Show the Apps Shortcut "bookmark" in the bookmarks bar. BUG=142796 TEST=manually with $ out/Release/chrome --user-data-dir=/tmp/udd --force-fieldtrials='InstantExtended/Group1 espv:205/' Review URL: https://chromiumcodereview.appspot.com/18331019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210648 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl: Update revision in DEPS, r11688 -> r11705mseaborn@chromium.org2013-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following Native Client changes: r11689: (shcherbina) Support shift instructions in text-based spec. r11690: (shcherbina) Add targeted tests for LOOP instructions. r11691: (shcherbina) Allow loop instructions. r11692: (mseaborn) Add test: check that libgcc_eh's stack unwinding restores all x86-64 registers r11693: (mseaborn) Add missing declaration for lstat() to <sys/stat.h> r11694: (mseaborn) Add stubs for fsync() and fdatasync() to libnosys r11695: (mseaborn) PNaCl: Update comment in crtbegin.c r11696: (jvoung) Archive finalized/frozen pnacl-llc/ld instead of simply strip. r11697: (jvoung) Allow -pnaclabi-allow-dev-intrinsics to pass through pnacl-translate. r11698: (mseaborn) Cleanup: Remove unnecessary rounding when allocating initial thread block r11699: (mseaborn) Avoid using sbrk()/sysbrk() for the initial thread's TLS setup r11700: (mcgrathr) toolchain_build: Update gcc revision r11701: (mseaborn) Update ARM GCC toolchain to r11681 for <sys/mman.h> and getpagesize() fixes r11702: (mseaborn) Cleanup: Remove workarounds for <sys/mman.h> #includability bug r11703: (shcherbina) Check that mask in 'and <mask>,%rsp' is negative (in text-based spec). r11704: (shcherbina) Add targeted tests for jcxz. r11705: (shcherbina) Add jcxz support to text-based validator specification. BUG=none TEST=nacl_integration Review URL: https://codereview.chromium.org/18089026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210647 0039d316-1c4b-4281-b951-d872f2087c98
* Relayout panels on display configuration change.flackr@chromium.org2013-07-092-0/+14
| | | | | | | | | BUG=243359 TEST=Plug in an external display with a different size, open some panels on each display and change the primary display. Panels should move to the correct position on the new display. Review URL: https://chromiumcodereview.appspot.com/18331014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210646 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2013-07-091-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210645 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up shill error handlingstevenjb@chromium.org2013-07-099-116/+102
| | | | | | | | | BUG=none R=gspencer@chromium.org Review URL: https://codereview.chromium.org/18344015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210644 0039d316-1c4b-4281-b951-d872f2087c98
* Add debugging UI for NetworkStateHandler Favoritesstevenjb@chromium.org2013-07-096-45/+170
| | | | | | | | | BUG=251922 R=jennyz@chromium.org Review URL: https://codereview.chromium.org/18031020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210643 0039d316-1c4b-4281-b951-d872f2087c98
* cros_system_api roll: 49a362b, f9c2e78, 648ba6bstevenjb@chromium.org2013-07-091-1/+1
| | | | | | | | | BUG=None R=cmasone@chromium.org, derat@chromium.org Review URL: https://codereview.chromium.org/18533010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210642 0039d316-1c4b-4281-b951-d872f2087c98
* XRay refactornfullagar@chromium.org2013-07-098-610/+818
| | | | | | | | | | | | | | - split out reporting, symbol parsing - allow more than one instance of xray to run at a time on differing threads - add lots of helper functions to parse frames and trace data - add option to use gettimeofday vs. rdtsc BUG=none TEST=experimental,manual R=bradnelson@google.com Review URL: https://codereview.chromium.org/18331016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210641 0039d316-1c4b-4281-b951-d872f2087c98
* [NaCl SDK] update_nacl_manifest: Better logging, upload to CDS.binji@chromium.org2013-07-093-53/+114
| | | | | | | | | | | | | | | | We often want to know why a particular version is being skipped/chosen during the SDK update process. Now update_nacl_manifest will track that information and upload it to commondatastorage. Once this starts uploading, I'll modify the manifest viewer page to read this data. BUG=none R=sbc@chromium.org Review URL: https://codereview.chromium.org/18648004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210640 0039d316-1c4b-4281-b951-d872f2087c98
* Pull TestExtensionDir out of ExtensionLoadingBrowsertest into its own file, thenkalman@chromium.org2013-07-099-181/+219
| | | | | | | | | | use it in ExtensionMessagesApitest. R=jyasskin@chromium.org Review URL: https://chromiumcodereview.appspot.com/18298010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210639 0039d316-1c4b-4281-b951-d872f2087c98
* Added documentation for In-App Payments API.awatson@chromium.org2013-07-097-0/+227
| | | | | | | | | | | | BUG=181763 STAGED DOC: http://ypd-ubiq182.dls.corp.google.com:8000/apps/service_in_app_payments.html R=kalman@chromium.org, saroop@chromium.org Review URL: https://codereview.chromium.org/18186004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210638 0039d316-1c4b-4281-b951-d872f2087c98
* Disable editing bookmarks when the proper preference is set (e.g. because of ↵csorba@chromium.org2013-07-091-3/+12
| | | | | | | | | | | | | a policy). The CL has an internal part at the following place: https://gerrit-int.chromium.org/#/c/40673/ BUG=257005 Review URL: https://chromiumcodereview.appspot.com/18292004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210637 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed the gear menu.mtomasz@chromium.org2013-07-091-0/+1
| | | | | | | | | | | The previous patch broke the gear menu. This CL fixes it by adding the missing style. TEST=The gear menu should render properly. BUG=240151 Review URL: https://chromiumcodereview.appspot.com/18271013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210636 0039d316-1c4b-4281-b951-d872f2087c98
* Rename webkit_(resources|strings) targets to remove _temp infixjamesr@chromium.org2013-07-0917-53/+41
| | | | | | | | | | | | | This is part 3 of the sequence started by https://codereview.chromium.org/17472006/. This updates all chromium-side targets to depend on the final target names, the only stragglers are dependencies in blink which still depend on the forwarding _temp targets defined in webkit_resources.gyp. R=darin Review URL: https://chromiumcodereview.appspot.com/18209009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210635 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 210625 "Make the SetCursorResourceModuleName function in ..."ajwong@chromium.org2013-07-0921-23/+64
| | | | | | | | | | | | | | | | | | | | | | | > Make the SetCursorResourceModuleName function in the CursorLoaderWin class a static function and remove it from the > CursorLoader and CursorClient interface. > > This function is currently called from the ctor of the ChromeContentBrowserClient class which ensures that it happens > when the browser starts up and avoids any race conditions due to code attempting to read the module name before it > was set. > > This ensures that the non standard webkit cursors can be loaded correctly when needed. > Fixes bug https://code.google.com/p/chromium/issues/detail?id=257983 > > Bug=257983 > R=sky@chromium.org > > Review URL: https://codereview.chromium.org/18132011 TBR=ananta@chromium.org Review URL: https://codereview.chromium.org/18786003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210634 0039d316-1c4b-4281-b951-d872f2087c98
* Final patch to migrate CompositingReasons to uint64.hartmanng@chromium.org2013-07-091-4/+1
| | | | | | | | BUG=240946 Review URL: https://chromiumcodereview.appspot.com/18230002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210633 0039d316-1c4b-4281-b951-d872f2087c98
* [NaCl SDK] nacl_io: remove default prefix for /dev/tty messagessbc@chromium.org2013-07-093-10/+18
| | | | | | | | | | | Also fix simple_hello_world example so that the stdout is correctly re-directed to chrome vis PostMessage. R=binji@chromium.org Review URL: https://codereview.chromium.org/18341024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210632 0039d316-1c4b-4281-b951-d872f2087c98
* fix using GAIA profile images as avatar icon under Linuxbcwhite@chromium.org2013-07-091-2/+7
| | | | | | | | BUG=257124 Review URL: https://chromiumcodereview.appspot.com/18533004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210631 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unused ui/views/views_text_utils files.msw@chromium.org2013-07-093-235/+0
| | | | | | | | | | | | | | | I previously removed these files in http://crrev.com/165832 Bartosz reverted in http://crrev.com/166015 for Issue 152928. Bartosz added custom code instead in http://crrev.com/170802 These files have been unused for over a year; time to remove. BUG=none TEST=No build problems, no complaints. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/18523014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210630 0039d316-1c4b-4281-b951-d872f2087c98
* [rAC, OSX] Add support for field validation.groby@chromium.org2013-07-0918-110/+432
| | | | | | | | | | | | | | | The rAC dialog will now validate input fields: * On accept - validates all fields in all sections. * On firstResponder change - validate last edited section. * On input editing - revalidate current field. R=isherman@chromium.org, sail@chromium.org BUG=157274 Review URL: https://chromiumcodereview.appspot.com/18054025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210629 0039d316-1c4b-4281-b951-d872f2087c98