summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* add enable_webrtc in gyp to allow some platform to disable webrtc. ↵wjia@chromium.org2011-07-191-0/+4
| | | | | | | | | | enable_webrtc is set to 1 by default. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/7450003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93108 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: revive a mysteriously disabled test and add tests for the GNOME ↵mdm@chromium.org2011-07-191-1/+34
| | | | | | | | | | | | Keyring native backend. In order to make the GNOME Keyring API mockable, I've substituted evil preprocessor macros with a slightly less evil scoping trick, and used it even when linking directly. I'm not sure when password_store_x_unittest fell out of the gyp file, but it hasn't been compiled for some time apparently so it required a bit of cleanup to make it compile. I also did a little unrelated cleanup in the gyp files and fixed typos in password_store_default_unittest. BUG=none Review URL: http://codereview.chromium.org/7396013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93093 0039d316-1c4b-4281-b951-d872f2087c98
* Move app/sql/* files to sql/ directory.tfarina@chromium.org2011-07-191-1/+0
| | | | | | | | | | | | | | | | I can't remove app/app.gyp and app/app_base.gypi yet because they are referenced by third_party gyp files :( BUG=72317 TEST=None R=rsesek@chromium.org move app/sql to sql Review URL: http://codereview.chromium.org/7353026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93069 0039d316-1c4b-4281-b951-d872f2087c98
* Add a separate build target for Dr. Memory/Win and add unit_tests theretimurrrr@chromium.org2011-07-191-0/+20
| | | | | | | | The target was copied from the TSan/Win configuration Review URL: http://codereview.chromium.org/7430004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93008 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce ui.dll / libui.so for the component build.darin@chromium.org2011-07-171-0/+6
| | | | | | | R=ben@chromium.org Review URL: http://codereview.chromium.org/7328011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92819 0039d316-1c4b-4281-b951-d872f2087c98
* Remove now-unused pepper_scripting option from gyp.dmichael@chromium.org2011-07-151-9/+0
| | | | | | | | | | BUG=82606 TEST=trybots Review URL: http://codereview.chromium.org/7390008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92709 0039d316-1c4b-4281-b951-d872f2087c98
* Make policy removable using ifdefs instead of stubs.torne@chromium.org2011-07-141-0/+3
| | | | | | | | | | | | | | For the gyp flag configuration_policy=0, use ifdefs in the places where policy classes are referred to, rather than providing stubs that implement parts of the policy classes. This is somewhat simpler and less fragile. This reverts part of r87468 (where this flag was introduced) but keeps other parts which are still valuable. BUG=85534 Review URL: http://codereview.chromium.org/7343008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92549 0039d316-1c4b-4281-b951-d872f2087c98
* Add WebUI certificate viewer to eventually replace GTK certificate viewer.flackr@chromium.org2011-07-141-0/+14
| | | | | | | | | | | | | | Hidden behind the gyp flag webui_certificate_viewer, this dialog will replace the GTK certificate viewer as part of the nogtk effort. This CL only adds the new certificate viewer but does not use it unless compiled with webui_certificate_viewer=1. This is the first stage, which adds the viewer and only shows the "General" certificate details (As shown in the General tab in the GTK viewer). The next steps are to show the detailed information, resolve some minor display and functionality issues on desktop builds and then make this the standard certificate viewer. BUG=None TEST=Manually viewed certificate details for several secure sites. Review URL: http://codereview.chromium.org/7331016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92541 0039d316-1c4b-4281-b951-d872f2087c98
* Disable ASLR for debug builds.siggi@chromium.org2011-07-141-0/+9
| | | | | | | | | | | This will make debugging Chrome with WinDbg a little less painful. BUG=none TEST=everything compiles Review URL: http://codereview.chromium.org/7329020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92531 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change to start builds.cmp@chromium.org2011-07-141-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92507 0039d316-1c4b-4281-b951-d872f2087c98
* Add COMPONENT_BUILD global define. darin@chromium.org2011-07-131-0/+8
| | | | | | | | | | | | | | | | | | | | | This avoids the need to define FOO_DLL macros for each project that we wish to optionally build as a DLL (when component=="shared_library"). This in turn means that we do not need direct_dependent_settings to define FOO_DLL, and that means that we don't need to update projects to convert transitive dependencies into explicit dependencies. This makes the component build more consistent with the static build. An alternative would be to use all_dependent_settings, but I feel that the global approach is simpler as it creates less repetition in each target definition for components. A side-effect of this change is that I needed to make base_nacl_win64 be a shared_library in the component build. R=rvargas,bradnelson,evan Review URL: http://codereview.chromium.org/7344022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92409 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 92378 because it broke Win Builder (dbg)(shared) - Additional Commits ↵sadrul@chromium.org2011-07-131-1/+0
| | | | | | | | | | | | | | | | | | for Linux printer driver Initial commit for Linux virtual printer BUG= TEST= Review URL: http://codereview.chromium.org/7222011 TBR=abeera@google.com Review URL: http://codereview.chromium.org/7354024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92379 0039d316-1c4b-4281-b951-d872f2087c98
* Additional Commits for Linux printer driverabeera@google.com2011-07-131-0/+1
| | | | | | | | | | | | | Initial commit for Linux virtual printer BUG= TEST= Review URL: http://codereview.chromium.org/7222011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92378 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Add COMPONENT_BUILD global define. "yurys@chromium.org2011-07-131-8/+0
| | | | | | | | | | | | | The change broke compilation on Linux Builder (dbg)(shared): http://build.chromium.org/p/chromium/builders/Linux%20Builder%20%28dbg%29%28shared%29/builds/3365/steps/compile/logs/stdio TBR=darin BUG=None TEST=None Review URL: http://codereview.chromium.org/7352014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92329 0039d316-1c4b-4281-b951-d872f2087c98
* Add COMPONENT_BUILD global define. darin@chromium.org2011-07-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | This avoids the need to define FOO_DLL macros for each project that we wish to optionally build as a DLL (when component=="shared_library"). This in turn means that we do not need direct_dependent_settings to define FOO_DLL, and that means that we don't need to update projects to convert transitive dependencies into explicit dependencies. This makes the component build more consistent with the static build. An alternative would be to use all_dependent_settings, but I feel that the global approach is simpler as it creates less repetition in each target definition for components. A side-effect of this change is that I needed to make base_nacl_win64 be a shared_library in the component build. R=rvargas,bradnelson Review URL: http://codereview.chromium.org/7344022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92325 0039d316-1c4b-4281-b951-d872f2087c98
* Turn off scripting by default. If this sticks, a later CL will delete all ↵dmichael@chromium.org2011-07-131-1/+1
| | | | | | | | | | | the dead code. BUG=82606 TEST=trybots Review URL: http://codereview.chromium.org/7345014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92294 0039d316-1c4b-4281-b951-d872f2087c98
* Remove references to app_unittests in all.gyp and chrome_tests.gypi.tfarina@chromium.org2011-07-111-9/+1
| | | | | | | | | | | BUG=72317 TEST=None R=rsesek@chromium.org Review URL: http://codereview.chromium.org/7331032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92083 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the comments setting emands and vim tab width and expansion variables.tony@chromium.org2011-07-1110-55/+0
| | | | | | | | | | | | | | | | | These were added in r28089 (http://codereview.chromium.org/256059) but are unnecessary bloat for everyone to carry around, even those that don't use emacs or vim. In an earlier change, I added editor config files in src/tools/emacs/ and src/tools/vim/ so users of the appropriate editor can source those instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/7310019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92046 0039d316-1c4b-4281-b951-d872f2087c98
* Make safe browsing optional at compile time.torne@chromium.org2011-07-111-0/+4
| | | | | | | | | Introduce a gyp variable "safe_browsing" which can be set to 0 to remove safe browsing code at compile time. Review URL: http://codereview.chromium.org/7227013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92000 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change to start builds.cmp@chromium.org2011-07-111-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91986 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed sha1 for gold package.bevc@google.com2011-07-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/7324036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91921 0039d316-1c4b-4281-b951-d872f2087c98
* Reland http://codereview.chromium.org/7312008/dmichael@chromium.org2011-07-081-0/+9
| | | | | | | | | | | | | | | The only difference is I clear modifiers in Scrollbar test, and leave it enabled. Unrevert ppapi_tests change: Porting ppapi_tests framework to postMessage. Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl. BUG=82606 TEST=these tests. Review URL: http://codereview.chromium.org/7237056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91912 0039d316-1c4b-4281-b951-d872f2087c98
* Add libwww-perl to the list of installed packages.tony@chromium.org2011-07-081-4/+4
| | | | | | | | | | There are two WebKit layout tests that try to use the HTTP::Date perl module. This seems to be part of ubuntu-desktop, but in my chroot, I needed to manually install this package. Review URL: http://codereview.chromium.org/7237053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91899 0039d316-1c4b-4281-b951-d872f2087c98
* Updated gold to 2.21.1 and removed the patching for the older version of Gold.bevc@google.com2011-07-081-52/+2
| | | | | | Review URL: http://codereview.chromium.org/7326019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91889 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete comment about app_unittests in chromium_builder_dbg_tsan_win ↵tfarina@chromium.org2011-07-081-4/+0
| | | | | | | | | | | | | target. BUG=72317 TEST=None R=tony@chromium.org Review URL: http://codereview.chromium.org/7329002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91877 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 91859 - Porting ppapi_tests framework to postMessage.dmichael@chromium.org2011-07-081-9/+0
| | | | | | | | | | | | | | | | Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl. I also added a gyp option: pepper_scripting. The default is that scripting is on in this CL, but it will make it easy to turn it off in local builds. Soon we'll switch the default to no scripting, and soon after we can remove the option entirely. BUG=82606 TEST=these tests Review URL: http://codereview.chromium.org/7312008 TBR=dmichael@chromium.org Review URL: http://codereview.chromium.org/7329024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91866 0039d316-1c4b-4281-b951-d872f2087c98
* Porting ppapi_tests framework to postMessage.dmichael@chromium.org2011-07-081-0/+9
| | | | | | | | | | | | | Some tests still rely on scripting, so we changed to using InstancePrivate (since scripting will disappear from Instance soon). Also use conditional compilation so that if compiled as untrusted with NaCl, the tests use Instance instead of InstancePrivate. This means that tests which rely on scripting aren't runnable in NaCl. I also added a gyp option: pepper_scripting. The default is that scripting is on in this CL, but it will make it easy to turn it off in local builds. Soon we'll switch the default to no scripting, and soon after we can remove the option entirely. BUG=82606 TEST=these tests Review URL: http://codereview.chromium.org/7312008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91859 0039d316-1c4b-4281-b951-d872f2087c98
* Add performance_ui_tests to chromium_builder.cmp@chromium.org2011-07-081-1/+2
| | | | | | Review URL: http://codereview.chromium.org/7326008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91795 0039d316-1c4b-4281-b951-d872f2087c98
* Start compiling in smooth scrolling by default on Linux.scottbyer@chromium.org2011-07-071-3/+11
| | | | | | | | | | BUG=61140 TEST=Default compilation on Linux builds in smooth scrolling behind a flag - check about:flags to verify. Review URL: http://codereview.chromium.org/7314015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91726 0039d316-1c4b-4281-b951-d872f2087c98
* Enable registerProtocolHandler on Linuxbenwells@chromium.org2011-07-051-9/+3
| | | | | | | | | | BUG=83557 TEST=QA testing required Review URL: http://codereview.chromium.org/7282046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91487 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change.cmp@chromium.org2011-07-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91460 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change.cmp@chromium.org2011-07-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91457 0039d316-1c4b-4281-b951-d872f2087c98
* Don't use -fstack-protector-all in Valgrind configurations.mark@chromium.org2011-07-011-1/+7
| | | | | | | | | | | | | | | | r91301 was not intended to be used in Valgrind configurations, but the GYP variable controlling Valgrind builds is named release_valgrind_build, which makes it seem like the Valgrind builders use the Release configuration. r91301 was only effective in Debug mode. Who would have guessed that the Valgrind builders actually use the Release configuration, and a separate check for release_valgrind_build is needed to keep them from using -fstack-protector-all. BUG=88238 TEST=none Review URL: http://codereview.chromium.org/7302010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91367 0039d316-1c4b-4281-b951-d872f2087c98
* Use -fstack-protector-all (stack canaries) for Mac debug builds.mark@chromium.org2011-07-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This was previously in effect at r29591 and then backed out at r29601 because it may have caused problems with Valgrind. The Valgrind problems were probably actually caused by -pie, which was recently reintroduced with protection against being used in Valgrind configurations. I don't think that we have any Valgrind builds that use the Debug configuration, so reintroducing this here shouldn't have any effect on Valgrind. Ancient history: in the pre-GYP days, we had -fstack-protector and -fstack-protector-all in the debug.xcconfig that our Xcode-based build used. See http://src.chromium.org/viewvc/chrome/trunk/src/build/debug.xcconfig?view=markup&pathrev=21959 More information on this option: http://developer.apple.com/library/mac/#documentation/DeveloperTools/gcc-4.2.1/gcc/Optimize-Options.html#index-fbtr_002dbb_002dexclusive-615 http://en.wikipedia.org/wiki/Buffer_overflow_protection#GCC_Stack-Smashing_Protector_.28ProPolice.29 BUG=16713 (not really, that's for release builds, but close enough) TEST=everything Review URL: http://codereview.chromium.org/7291019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91301 0039d316-1c4b-4281-b951-d872f2087c98
* Mmm, pie.mark@chromium.org2011-07-011-0/+13
| | | | | | | | | | | | | | | | | | | Enable position independence by linking executables with the -pie linker flag. This was previously done in r29592, but had to be backed out in r29604 because Valgrind didn't understand slide. I don't know if Valgrind understands slide or not on Mac OS X now, but for the time being, we'll do this in non-Valgrind build configurations. Position independence turns on address space layout randomization (ASLR). No perf impact expected. We don't really have any significant quantity of exported symbols for the loader to chew on. BUG=16713 TEST=Everything should still work Review URL: http://codereview.chromium.org/7291012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91243 0039d316-1c4b-4281-b951-d872f2087c98
* As per oshima:saintlou@chromium.org2011-06-301-1/+28
| | | | | | | | | | | | | | | | | | | | | | | The ultimate goal is to eliminate TOOLKIT_USES_GTK. Once that migration is completed, TOOLKIT_VIEWS + OS_LINUX should be enough. Until this happens, we need a binary that: 1) has both gtk and pure-views 2) can enable pure views components with --use-pure-views when possible (this is default in touchui=1). If we could switch everything with --use-pure-views, that'd be nice, but the world is not perfect and there are things that cannot co-exist (such as message pump). For such component, we'll use GYP_DEFINES to switch. 1) TOOLKIT_USES_PURE_VIEWS is defined with toolkit_pure_views=1. 2) all (or most of) chrome features must be functional with toolkit_pure_views=1 3) both TOOLKIT_USES_GTK and TOOLKIT_USES_PURE_VIEWS are defined. The latter has higher priority (that is, if implementation can't co-exists, TOOLKIT_USE_PURE_VIEWS will take precedence). 4) As the migration proceeds, there will be less TOOLKIT_USES_GTK and more TOOLKIT_USES_PURE_VIEWS. 5) Once the migration is complete (that is, there is no TOOKIT_USES_GTK), we can remove TOOLKIT_USES_PURE_VIEWS or replace it with OS_LINUX when necessary. BUG=none TEST=none Review URL: http://codereview.chromium.org/7273079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91164 0039d316-1c4b-4281-b951-d872f2087c98
* Add sql/sql.gyp to start building libsql and sql_unittests.rsesek@chromium.org2011-06-301-0/+9
| | | | | | | | | | | | Nothing uses this yet, but is needed to make the changes to buildbot. It only hooks into all.gyp so it can be built. BUG=72317 TEST=sql_unittests Review URL: http://codereview.chromium.org/7281015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91132 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change. Test a waterfall update.cmp@chromium.org2011-06-281-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90743 0039d316-1c4b-4281-b951-d872f2087c98
* Removing defunct OpenMAX code (round 2).scherkus@chromium.org2011-06-281-1/+0
| | | | | | | | | | | All of this code hasn't been used in over a year and has been replaced by VideoDecodeAccelerator and it's corresponding OpenMAX implementation OmxVideoDecodeAccelerator. BUG=none TEST=the world still compiles Review URL: http://codereview.chromium.org/7066071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90697 0039d316-1c4b-4281-b951-d872f2087c98
* Update translations using strings from launchpad.net r255fta@sofaraway.org2011-06-271-1/+4
| | | | | | | | | This includes a new lang: bs (Bosnian). Patch from Fabien Tassin <fta@sofaraway.org>. Review URL: http://codereview.chromium.org/7278001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90652 0039d316-1c4b-4281-b951-d872f2087c98
* Upstream android string implementation etc.michaelbai@google.com2011-06-271-3/+17
| | | | | | | | | BUG= TEST= Review URL: http://codereview.chromium.org/7238018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90616 0039d316-1c4b-4281-b951-d872f2087c98
* Implement AES-CTR for NSS.hclam@chromium.org2011-06-241-0/+3
| | | | | | | | | | | Implement AES-128-CTR. BUG=87152 TEST=None Review URL: http://codereview.chromium.org/7056026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90425 0039d316-1c4b-4281-b951-d872f2087c98
* Now try and make -pie stick for 32-bit Linux too.cevans@chromium.org2011-06-241-8/+4
| | | | | | | TBR=jeffbailey Review URL: http://codereview.chromium.org/7240019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90335 0039d316-1c4b-4281-b951-d872f2087c98
* Linux/CrOS smooth scrolling support - behind a flag.scottbyer@chromium.org2011-06-231-0/+3
| | | | | | | | | | | | Add runtime flag to control smooth scrolling. Add compile time flag handling for a GYP_DEFINE (enable_smooth_scrolling=1). BUG=575,61140 TEST=compile still works without the flag. Compiling with the flag works once the WebKit change is landed, and then the flag appears in the about:flags page, and actually turns on that WebKit implementation. Review URL: http://codereview.chromium.org/7034052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90136 0039d316-1c4b-4281-b951-d872f2087c98
* Trying to make the -pie stick for x64 on the main waterfall...cevans@chromium.org2011-06-221-1/+5
| | | | | | | TBR=jeffbailey Review URL: http://codereview.chromium.org/7206052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89945 0039d316-1c4b-4281-b951-d872f2087c98
* Add Skia on Chrome for Mac gyp rulescaryclark@chromium.org2011-06-211-0/+13
| | | | | | | | | | | | | | | | In addition to these rules, to build the USE_SKIA_ON_MAC_CHROME variation, define: gyp_defines='use_skia=1' As is, this does not change any existing platform, and has no new tests. BUG=79463 TEST=none Review URL: http://codereview.chromium.org/7219009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89877 0039d316-1c4b-4281-b951-d872f2087c98
* Update translations using strings from launchpad.net r248fta@sofaraway.org2011-06-211-1/+1
| | | | | | | | Patch from Fabien Tassin <fta@sofaraway.org>. Review URL: http://codereview.chromium.org/7205044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89861 0039d316-1c4b-4281-b951-d872f2087c98
* Added language_pack_fr to dev_list of packages to be installed.pschmidt@google.com2011-06-161-3/+3
| | | | | | Review URL: http://codereview.chromium.org/7187009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89385 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change.cmp@chromium.org2011-06-161-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89292 0039d316-1c4b-4281-b951-d872f2087c98
* Remove msvs_guids from app, base, breakpad and build.tony@chromium.org2011-06-131-1/+0
| | | | | | | | BUG=28727 Review URL: http://codereview.chromium.org/7108053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88871 0039d316-1c4b-4281-b951-d872f2087c98