summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Preload with RVH/RV messaging instead of NOTIFICATION_NAV_ENTRY_COMMITTED.scr@chromium.org2011-08-0210-79/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is the first working version using a preload message in the style of viewsource. NOTIFICATION_NAV_ENTRY_COMMITTED was too late as it was after the navigate command was sent and was a race condition to inject before the onload ran. Basic gist of this patch is: - Wait for RVH creation by listening for NOTIFICATION_RENDER_VIEW_HOST_CREATED. Since this is called from constructor, we must listen to AllSources() and assume the next RVH creation is ours. This is controlled test case, so we're probably ok. - When RenderViewHostInitialized, call the OnJsInjectionReady passing the RVH. JsInjectionReadyObserver should now use that RVH to Send a ViewMsg_WebUIJavascript message to register javascript to preload. - the ChromeRenderViewObserver will stash the javascript and load it when DidStartLoading. BUG=90476 TEST=browser_tests --gtest_filter=PrintPreview*WebUI*.* Review URL: http://codereview.chromium.org/7531029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95048 0039d316-1c4b-4281-b951-d872f2087c98
* Make Tab key to work on new bookmark dialog.kinaba@chromium.org2011-08-021-0/+58
| | | | | | | | | BUG=chromium-os:7725 TEST=Right-click on bookmark bar and select "Add page..." or "Add folder...", then click Tab key. Review URL: http://codereview.chromium.org/7544011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95047 0039d316-1c4b-4281-b951-d872f2087c98
* Include accelerated_compositing disable flag in calculation ofnduca@chromium.org2011-08-022-2/+10
| | | | | | | | | | | about:gpu feature status. BUG=90723 TEST=Run chrome with --disable-accelerated-compositing, verify about:gpu status is expected Review URL: http://codereview.chromium.org/7523019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95046 0039d316-1c4b-4281-b951-d872f2087c98
* Add IME apis to extension jsonzork@chromium.org2011-08-021-2/+494
| | | | | | | | | BUG=chromium-os:16090 TEST=None Review URL: http://codereview.chromium.org/7211011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95043 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed offline edge detection.zelidrag@chromium.org2011-08-021-1/+0
| | | | | | | | BUG=chromium-os:18480 TEST=make sure offline notification is properly shown on login screen (add user, then disconnect) Review URL: http://codereview.chromium.org/7553005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95042 0039d316-1c4b-4281-b951-d872f2087c98
* Handle composite glyphs correctly in font subsetter.arthurhsu@chromium.org2011-08-022-30/+76
| | | | | | | | | | BUG=90764 TEST=none Review URL: http://codereview.chromium.org/7535002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95041 0039d316-1c4b-4281-b951-d872f2087c98
* Fix crashing bug with session sync enabled and opening developer tools.yfriedman@chromium.org2011-08-021-1/+3
| | | | | | | | | | BUG=91070 TEST=Run chrome with --enable-sync-sessions and open developer tools. Review URL: http://codereview.chromium.org/7518030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95040 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing virtual qualifiers to appease clang.wez@chromium.org2011-08-021-4/+4
| | | | | | | | | BUG= TEST= Review URL: http://codereview.chromium.org/7553004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95039 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-021-4/+4
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95036 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl: Update revision in DEPS, r6258 -> r6275mseaborn@chromium.org2011-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following Native Client changes: r6259: (pdox) Update LLVM_GCC_MQ_REV to activate: r6260: (pdox) Clobber libgcc_eh.a in the build directory, to force it to be rebuilt. r6261: (nfullagar) Reduce time pyauto takes to run by reducing some counts. r6262: (jvoung) Don't update the MQ repos twice (already updated once in the setup-hg-mq) r6263: (polina) PPAPI proxy: do not check for NULL interfaces and NULL interface methods in r6264: (pdox) Move libgcc_eh back to native code (part 2) r6265: (pdox) Don't verify SDK archives in glibc mode, since there are none anymore. r6266: (mseaborn) x86-32 sandbox: Set %esp/%ss simultaneously in syscall entry path r6269: (halyavin) Fix resource leak in service runtime. r6270: (mseaborn) Add test using NaCl with a minimal set of syscalls r6271: (jvoung) Pnacl driver-side change to plumb through -mtls-use-call. r6272: (robertm) Second attempt for initial test of url_loader api families. r6273: (polina) Add CRASH macro to ppapi_test_lib and use in crash tests. r6274: (mcgrathr) Update binutils to commit 38c9b31 r6275: (ncbray) Minimal Mac release builder fix. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/7453060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95035 0039d316-1c4b-4281-b951-d872f2087c98
* EnableNetworkDevice() allows a PyAuto test to disable and enable ethernet, ↵dtu@chromium.org2011-08-027-4/+127
| | | | | | | | | | | | wifi, and cellular. Also included are new fields for GetNetworkInfo() that tell you if devices are available and/or enabled. BUG=chromium-os:18024 TEST=python chromeos_wifi_sanity.py chromeos_wifi_sanity.ChromeosWifiSanity.testEnableNetworkDevice Review URL: http://codereview.chromium.org/7488064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95034 0039d316-1c4b-4281-b951-d872f2087c98
* Added SetDraftMode() and GetDraftMode() functions to |MetafileSkiaWrapper| ↵kmadhusu@chromium.org2011-08-022-1/+21
| | | | | | | | | | | | class. BUG=none TEST=none Review URL: http://codereview.chromium.org/7537042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95033 0039d316-1c4b-4281-b951-d872f2087c98
* Separate channel authentication code from JingleStreamConnecter.sergeyu@chromium.org2011-08-025-167/+339
| | | | | | | | | | | | The new ChannelAuthenticator will also be used for pepper-based protocol implementation. BUG=51198 TEST=Unittests Review URL: http://codereview.chromium.org/7537036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95030 0039d316-1c4b-4281-b951-d872f2087c98
* Added delay for network goining online event handling in order to work ↵zelidrag@chromium.org2011-08-022-6/+38
| | | | | | | | | | around dns resolution issue in ChromeOS conenction manager. BUG=chromium-os:18480 TEST=make sure webui OOBE does not show host not found page again Review URL: http://codereview.chromium.org/7453047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95029 0039d316-1c4b-4281-b951-d872f2087c98
* Fix up window not closing on Mac.dmaclach@chromium.org2011-08-022-32/+14
| | | | | | | | | | | | | Xib changes -> Went from NSPanel to NSWindow BUG=90997 TEST=Create a chromoting connection on the mac, and then close it. Check to make sure the host window has gone away. Review URL: http://codereview.chromium.org/7541028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95028 0039d316-1c4b-4281-b951-d872f2087c98
* Unify infobars' link-opening behavior to respect user-requested dispositions ↵pkasting@chromium.org2011-08-026-18/+23
| | | | | | | | | | | | | | and append the Google locale param (since all these links are opening Google pages). This also fixes an incorrect "&" (should be "&") that I assume is a holdover from the string in question formerly being in generated_resources.grd. Randomly, this also removes some unnecessary .c_str() calls in logging_chrome.cc. BUG=none TEST=Middle-clicking "Learn more" on any applicable infobar should open the link in a new background tab. Review URL: http://codereview.chromium.org/7545021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95025 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95024 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 95009. Causing pyauto NTP test failures on all platforms.kkania@chromium.org2011-08-024-93/+82
| | | | | | | | | | | | | | | | Original CL: - Show crashed apps on NTP, desaturated. Click to reload. Also refactored CreateAppInfo a bit. BUG=90433 TEST=Crash a packaged app with a background page. It appears on the NTP, and clicking its icon relaunches it. Review URL: http://codereview.chromium.org/7517019 TBR=yoz@chromium.org Review URL: http://codereview.chromium.org/7553001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95023 0039d316-1c4b-4281-b951-d872f2087c98
* Roll webkit from r92151 to r92162.zmo@google.com2011-08-021-1/+1
| | | | | | | | | BUG=none TEST=tree green TBR=tonyg@chromium.org Review URL: http://codereview.chromium.org/7552001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95022 0039d316-1c4b-4281-b951-d872f2087c98
* Make the headers for protocol handler settings the same size as other headers.koz@chromium.org2011-08-022-3/+4
| | | | | | | | | TEST=tested visually Review URL: http://codereview.chromium.org/7524020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95021 0039d316-1c4b-4281-b951-d872f2087c98
* cros: Add missing "virtual" and OVERRIDE to overridden virtual methods of ↵tfarina@chromium.org2011-08-021-12/+15
| | | | | | | | | | | | | BrightnessLibrary. BUG=None TEST=None R=stevenjb@chromium.org Review URL: http://codereview.chromium.org/7541006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95020 0039d316-1c4b-4281-b951-d872f2087c98
* Improve Autofill heuristics when detecting labels from previous elements.isherman@chromium.org2011-08-0224-205/+1512
| | | | | | | | | | | | | | | | | | | | | | | | | | | Support HTML like """Name <span class="required">*</span> <input type="text" name="name">""" Of course, pull at a thread and... Other changes also included to avoid regressions: * When parsing address fields for heuristics, we try to skip over unlabeled fields in the middle of an address. Updated the code not to also skip over unlabeled fields at the *end* of an address, as these might be part of a different section entirely. * Tighten the credit card number regex to require the word "card". * Add "csc" to the credit card security code regex. * When inferring labels based on <div> structure, be willing to scan up the tree past the closest parent that is a <div>. * Also when inferring labels based on <div> structure, we previously would only stop early if we were about to escape from a <table> element. Also stop early if we are about to escape from a <fieldset> element. If we see either of these elements, we expect the field label to be contained with the element. * Allow <label> elements to misuse the 'for' attribute to specify the element's name rather than its id. BUG=87517 TEST=browser_tests --gtest_filter=FormStructureBrowserTest.DataDrivenHeuristics* Review URL: http://codereview.chromium.org/7531023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95019 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 95015 - WebUI TaskManager: make it default on Chrome OSyoshiki@chromium.org2011-08-0211-213/+68
| | | | | | | | | | | | | | | | | And fixes the code of task manager and following tests which didn't work correctly on WebUI TaskManager. - TaskManagerBrowserTest.ShutdownWhileOpen - ExtensionApiTest.ProcessesVsTaskManager - PrerenderBrowserTest.PrerenderTaskManager BUG=chromium-os:13885 TEST=trybots Review URL: http://codereview.chromium.org/7520011 TBR=yoshiki@chromium.org Review URL: http://codereview.chromium.org/7537045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95018 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95016 0039d316-1c4b-4281-b951-d872f2087c98
* WebUI TaskManager: make it default on Chrome OSyoshiki@chromium.org2011-08-0211-68/+213
| | | | | | | | | | | | | | And fixes the code of task manager and following tests which didn't work correctly on WebUI TaskManager. - TaskManagerBrowserTest.ShutdownWhileOpen - ExtensionApiTest.ProcessesVsTaskManager - PrerenderBrowserTest.PrerenderTaskManager BUG=chromium-os:13885 TEST=trybots Review URL: http://codereview.chromium.org/7520011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95015 0039d316-1c4b-4281-b951-d872f2087c98
* This is only the first part of the refactoring. The old method was preservedadriansc@google.com2011-08-0229-121/+352
| | | | | | | | | | | | | | | | | | | | and not all call points were changed. The second part will deal with factoring out the old OpenURL method. Overall purpose: speed up calls, make it more flexible to plumb parameters to the call chain, reduce code repetition. It is necessary to add one more parameter (namely, override_encoding) to OpenURL in order to be able to restore the page encoding upon loading the contents. For solving this issue, it is necessary for the encoding to be restored from the BookmarkModel. BUG=2926 Review URL: http://codereview.chromium.org/7388007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95013 0039d316-1c4b-4281-b951-d872f2087c98
* Attempt to roll webkit from r91997 to r92151.zmo@google.com2011-08-021-1/+1
| | | | | | | | | | | | Some failing layouttests in windows (around 30) and linux (1) are expected. Rebaseline should fix them. Basically if the browser tests and interactive ui tests do not fail, this roll should stay and I'll do the rebaseline and another roll. The roll is getting too big, that's why I don't want to wait any longer. BUG=none TEST=none Review URL: http://codereview.chromium.org/7538037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95012 0039d316-1c4b-4281-b951-d872f2087c98
* Allow reentrancy for HostDispatcher::GetProxiedInterfacevrk@google.com2011-08-021-1/+5
| | | | | | | | | | | | | By allowing reentrancy in this function, we allow a PPB implementation to call GetPluginInterface from the constructor. Otherwise the renderer process hangs. (See PPB_VideoDecoder_Impl's constructor as an example.) BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/7540032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95010 0039d316-1c4b-4281-b951-d872f2087c98
* Show crashed apps on NTP, desaturated. Click to reload.yoz@chromium.org2011-08-014-82/+93
| | | | | | | | | | | Also refactored CreateAppInfo a bit. BUG=90433 TEST=Crash a packaged app with a background page. It appears on the NTP, and clicking its icon relaunches it. Review URL: http://codereview.chromium.org/7517019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95009 0039d316-1c4b-4281-b951-d872f2087c98
* history: use display title, not page titleevan@chromium.org2011-08-013-4/+4
| | | | | | | | | | | | | entry.title() is the underlying page title, but we want to record in history the actual title we show to the user. These differ in corner cases like when the page lacks a title, and also importantly in that the display title can include RTL metadata. BUG=27094 Review URL: http://codereview.chromium.org/7453053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95008 0039d316-1c4b-4281-b951-d872f2087c98
* Plumb the title direction up to the renderer hostevan@chromium.org2011-08-0111-28/+60
| | | | | | | | | | | | | | | | | We need the title direction to properly display titles in Chrome UI. Previously I tried just modifying the title when we get it from WebKit to include directionality overrides, but the extensions API needs the underlying title without direction markers. This change plumbs the title direction up to RenderViewHostDelegate. A further patch will make use of it from there. BUG=27094 Review URL: http://codereview.chromium.org/7453050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95007 0039d316-1c4b-4281-b951-d872f2087c98
* GetTimeInfo() returns the display time, date, and time zone.dtu@chromium.org2011-08-016-13/+166
| | | | | | | | | | | | | | | SetTimezone() sets the user's time zone. Also modifies the PyAuto function matching behavior. You can now specify two handlers for a PyAuto JSON call, one that takes a Browser and one that does not. BUG=chromium-os:18031 TEST=This is a test. Run python chromeos_time.py Review URL: http://codereview.chromium.org/7520019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95005 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 94999 - CrOS - Add memory consumption status bar widget behind flagjamescook@chromium.org2011-08-019-289/+10
| | | | | | | | | | | | | | Pass --memory-widget on CrOS to get a real-time display, updated every 5 seconds, of the system's free memory. Tooltip and menu itself detail the data from /proc/meminfo. Also made base::GetSystemMemoryInfo() available on Linux systems to provide detailed data. BUG=chromium-os:18446 TEST=manual Review URL: http://codereview.chromium.org/7518010 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/7544033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95004 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build after http://codereview.chromium.org/7537031/phajdan.jr@chromium.org2011-08-011-1/+0
| | | | | | | | | | | | We were using too many ScopedTestingBrowserProcesses at once. TBR=sky BUG=61062 Review URL: http://codereview.chromium.org/7453061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95002 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-011-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95001 0039d316-1c4b-4281-b951-d872f2087c98
* Roll webkit back to r91997.zmo@google.com2011-08-011-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7545023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95000 0039d316-1c4b-4281-b951-d872f2087c98
* CrOS - Add memory consumption status bar widget behind flagjamescook@chromium.org2011-08-019-10/+289
| | | | | | | | | | | Pass --memory-widget on CrOS to get a real-time display, updated every 5 seconds, of the system's free memory. Tooltip and menu itself detail the data from /proc/meminfo. Also made base::GetSystemMemoryInfo() available on Linux systems to provide detailed data. BUG=chromium-os:18446 TEST=manual Review URL: http://codereview.chromium.org/7518010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94999 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-011-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94998 0039d316-1c4b-4281-b951-d872f2087c98
* Roll webkit back to r92010.zmo@google.com2011-08-011-1/+1
| | | | | | | | BUG=none TEST=win bots green Review URL: http://codereview.chromium.org/7540035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94997 0039d316-1c4b-4281-b951-d872f2087c98
* Remove --enable-remoting flag.sergeyu@chromium.org2011-08-016-46/+23
| | | | | | | | | BUG=91256 TEST=None Review URL: http://codereview.chromium.org/7545018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94996 0039d316-1c4b-4281-b951-d872f2087c98
* Move more files from chrome/test to chrome/test/base, part #5phajdan.jr@chromium.org2011-08-0177-104/+104
| | | | | | | BUG=90905 Review URL: http://codereview.chromium.org/7537033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94995 0039d316-1c4b-4281-b951-d872f2087c98
* Implement Send() in JingleThreadWrapper.sergeyu@chromium.org2011-08-014-92/+322
| | | | | | | | | | | | | Send() is used in some of libjingle code. WebRTC needs to create two separate threads which Send() messages to each other. This wasn't previously supported in JingleThreadWrapper. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/7520014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94992 0039d316-1c4b-4281-b951-d872f2087c98
* Make Index DB code that accesses WebKit initialize WebKit first.levin@chromium.org2011-08-013-2/+32
| | | | | | | | | | BUG=None TEST=InProcessBrowserTest,IDBKeyPathWithoutSandbox after https://bugs.webkit.org/show_bug.cgi?id=64577 is landed. Review URL: http://codereview.chromium.org/7483001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94991 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-011-2/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94990 0039d316-1c4b-4281-b951-d872f2087c98
* Update NSS to r94921 to pick up http://codereview.chromium.org/7453039/.wtc@chromium.org2011-08-011-2/+2
| | | | | | | | | | R=rvargas@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/7544019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94989 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2011-08-011-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94988 0039d316-1c4b-4281-b951-d872f2087c98
* Attempt to roll webkit from r92010 to r92033zmo@google.com2011-08-011-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/7453056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94987 0039d316-1c4b-4281-b951-d872f2087c98
* Move Var and StringVar to the ppapi/shared_impl so they can be used in thebrettw@chromium.org2011-08-0138-484/+595
| | | | | | | | | | | | | | | | | | | proxy. This does not, however, actually use these in the proxy yet, I'll do that in a subsequent pass. ObjectVar is now renamed NPObjectVar and continues to be in webkit/plugins since it uses NPObjects. There will be a corresponding future class in the proxy for proxied objects. The TryCatch that was in var.h is now in npapi_glue.h Most of the rest of the change is updating namespaces. TEST=unit tests BUG=none Review URL: http://codereview.chromium.org/7488062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94986 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Make mixer code also look for mixers on ARM.derat@chromium.org2011-08-012-36/+64
| | | | | | | | | | | | | This makes the ALSA code look for controls named Headphone and Speaker in addition to the already-supported Master control. BUG=chromium-os:18284 TEST=still works on x86 Review URL: http://codereview.chromium.org/7523050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94985 0039d316-1c4b-4281-b951-d872f2087c98
* Profiles: Listen to a specific ThemeService for BROWSER_THEME_CHANGE ↵erg@chromium.org2011-08-019-12/+21
| | | | | | | | | | | | | | notifications. We don't want to respond to theme change notifications from other profiles. BUG=87457 TEST=none Review URL: http://codereview.chromium.org/7532004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94984 0039d316-1c4b-4281-b951-d872f2087c98