summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 20.0.1132.1920.0.1132.19gitdeps2014-04-062-552/+325
|
* Incrementing VERSION to 20.0.1132.19chrome-release@google.com2012-05-261-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139173 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138063 - Handle rare conditions, like message queue exhaustionjar@chromium.org2012-05-251-3/+43
| | | | | | | | | | | | bug=128734 r=rvargas Review URL: https://chromiumcodereview.appspot.com/10392163 TBR=jar@chromium.org Review URL: https://chromiumcodereview.appspot.com/10447042 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139110 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 139047 - BUG=129694rohitbm@chromium.org2012-05-251-18/+17
| | | | | | | | | | Fixing Netflix tests due to V2 plugin changes and optimized infobar waiting code. Thanks Nirnimesh! Review URL: https://chromiumcodereview.appspot.com/10441042 TBR=rohitbm@chromium.org Review URL: https://chromiumcodereview.appspot.com/10440051 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139072 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 137300 - Enable system trace clock use on chrome os.stevenjb@google.com2012-05-251-4/+8
| | | | | | | | | | | | | | | | | | | | | Merged by stevenjb@ for sleffler@ Enable CLOCK_SYSTEM_TRACE use when built with chromeos=1. Handle the case of building for chrome os but running on a non-chromeos platform by handling clock_gettime failure and falling back to HighResNow. BUG=chromium-os:30502 TEST=base_unittests + verify chrome:tracing works w/ a chromeos=1 build on linux and on cros (using the correct clock in each case) Change-Id: I1627e414524c04db27ddf2a62798a802ea440919 Review URL: https://chromiumcodereview.appspot.com/10384154 TBR=sleffler@chromium.org Review URL: https://chromiumcodereview.appspot.com/10440050 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139058 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 21dharani@chromium.org2012-05-251-0/+19
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139031 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138617 - Honor the session.restore_on_startup_pref on first startpastarmovj@chromium.org2012-05-252-0/+12
| | | | | | | | | | | | | | | This CL fixes a regression introduced by CL 9481003 that made the browser ignore the session.restore_on_startup pref on first start. BUG=125467 TEST=session.restore_on_startup, session.urls_to_restore_on_startup TEST=and RestoreOnStartup policy are honored on first start as well Review URL: https://chromiumcodereview.appspot.com/10417032 TBR=bartfab@chromium.org Review URL: https://chromiumcodereview.appspot.com/10443026 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@139004 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138264 - Re-enable embedded identities in URLs for HTTP ↵asanka@chromium.org2012-05-254-11/+332
| | | | | | | | | | | | | | | | authentication. (Second attempt) This effectively reverts r121506. BUG=123150 TEST=net_unittests. Username/passwords specified in URLs work. XmlHttpRequests() with credentials passed as arguments work. Review URL: https://chromiumcodereview.appspot.com/10412025 TBR=asanka@chromium.org Review URL: https://chromiumcodereview.appspot.com/10452024 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138992 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 20.0.1132.18chrome-release@google.com2012-05-251-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138968 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138948 - Disable Ctrl+Alt+Esc on Mac and Linux.jamiewalch@google.com2012-05-256-2/+46
| | | | | | | | | | | BUG=129652,129684 Review URL: https://chromiumcodereview.appspot.com/10453015 TBR=sergeyu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10447029 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138957 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138530 - Change fallback demo login screen, again.rkc@chromium.org2012-05-242-7/+5
| | | | | | | | | | | | | | | Change the fallback demo mode login screen to remove a bit of a visual jank that shows up when launching the screensaver. R=xiyuan@chromium.org,nkostylev@chromium.org BUG=129106 TEST=Tested with the --enable-kiosk-mode flag to confirm transitions. Review URL: https://chromiumcodereview.appspot.com/10408053 TBR=rkc@chromium.org Review URL: https://chromiumcodereview.appspot.com/10454028 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138932 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138531 - Fix crash in ParseValue.rkc@chromium.org2012-05-241-1/+6
| | | | | | | | | | | | | | | | | In some as of now unknown condition, the 'value' parameter to NativeVirtualNetworkParser::ParseValue is not a dictionary. There is a DCHECK for this in the code but in release builds it is just ignored and value is static cast into a dictionary type anyway. This causes the operations on the value type to crash (in the case of this particular crash, the ++iter crashes somewhere in _Rb_tree_iterator++). Fixing this by putting a runtime check for the type of value. Also added TODO to look into finding out why this is happening in the first place. R=zelidrag@chromium.org,gspencer@chromium.org BUG=126537 TEST=None. Review URL: https://chromiumcodereview.appspot.com/10414065 TBR=rkc@chromium.org Review URL: https://chromiumcodereview.appspot.com/10448015 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138931 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138480 - Check more strictly for IBusPanelService.nona@chromium.org2012-05-241-2/+8
| | | | | | | | | | | | | | According to this CL, we can avoid invalid object casting or signal disconnection. BUG=129142 TEST=manually on Alex. Review URL: https://chromiumcodereview.appspot.com/10413062 TBR=nona@chromium.org Review URL: https://chromiumcodereview.appspot.com/10447025 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138908 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 138890 - Merge 138264 - Re-enable embedded identities in URLs for ↵asanka@chromium.org2012-05-244-331/+11
| | | | | | | | | | | | | | | | | | HTTP authentication. This effectively reverts r121506. BUG=123150 TEST=net_unittests. Username/passwords specified in URLs work. XmlHttpRequests() with credentials passed as arguments work. Review URL: https://chromiumcodereview.appspot.com/10412025 TBR=asanka@chromium.org TBR=asanka@chromium.org Review URL: https://chromiumcodereview.appspot.com/10446024 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138905 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138264 - Re-enable embedded identities in URLs for HTTP authentication.asanka@chromium.org2012-05-244-11/+331
| | | | | | | | | | | | | This effectively reverts r121506. BUG=123150 TEST=net_unittests. Username/passwords specified in URLs work. XmlHttpRequests() with credentials passed as arguments work. Review URL: https://chromiumcodereview.appspot.com/10412025 TBR=asanka@chromium.org git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138890 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138325 - Fix transparent crack at top of page while resizing devtools ↵jbates@chromium.org2012-05-242-1/+26
| | | | | | | | | | | | | | NSSplitView divider. BUG=127652 TEST=Open devtools on http://www.webkit.org/blog-files/3d-transforms/poster-circle.html; resize divider bar; verify no transparent crack at top of page. Review URL: https://chromiumcodereview.appspot.com/10407075 TBR=jbates@chromium.org Review URL: https://chromiumcodereview.appspot.com/10441030 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138885 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138735 - No longer trigger SyncCredentialsLost flow on cros.atwilson@chromium.org2012-05-242-2/+76
| | | | | | | | | | | | | | On auto_start platforms (cros/android) we no longer start the sync backend until we have a chromiumsync token available. BUG=128592 TEST=Log in on cros, see sync start up. Review URL: https://chromiumcodereview.appspot.com/10434009 TBR=atwilson@chromium.org Review URL: https://chromiumcodereview.appspot.com/10440007 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138739 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138441 - Change setters of dbus::Message to return false instead of ↵hashimoto@chromium.org2012-05-247-47/+148
| | | | | | | | | | | | | | | | | aborting on errors With this change, we can safely return error for invalid object path and service name. It still crashes on invalid method name and interface name if we use MethodCall::MethodCall for setting those parameters. BUG=128967 TEST=dbus_unittests Review URL: https://chromiumcodereview.appspot.com/10409065 TBR=hashimoto@chromium.org Review URL: https://chromiumcodereview.appspot.com/10441010 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138727 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 20dharani@chromium.org2012-05-241-0/+19
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138725 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 20.0.1132.17chrome-release@google.com2012-05-241-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138701 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138509 - Allow Control+Shift+Q on lock screen.yusukes@google.com2012-05-245-15/+52
| | | | | | | | | | | | | | | Usually, when the screen is locked and the status area at the bottom right corner of the screen is not focused, Control+Shift+Q is handled by chrome/browser/chromeos/login/webui_login_view.cc. But when the status area is focused, Control+Shift+Q is handled by Ash, accelerator_controller.cc. BUG=120953 TEST=aura_shell_unittests + manual: focus the area and press C+S+Q on both login and lock screens Review URL: https://chromiumcodereview.appspot.com/10388230 TBR=yusukes@chromium.org Review URL: https://chromiumcodereview.appspot.com/10445005 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138687 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138394 - gdata: Fix a bug that caused histograms on gdata files to be ↵satorux@chromium.org2012-05-231-5/+8
| | | | | | | | | | | | | | | | skewed. We shouldn't record the histograms when processing delta feeds. BUG=129248 TEST=manually confirmed by chrome://histograms Review URL: https://chromiumcodereview.appspot.com/10416049 TBR=satorux@chromium.org Review URL: https://chromiumcodereview.appspot.com/10436011 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138662 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138580 - [NTP4] Doppleganger text is too big.dbeam@chromium.org2012-05-231-1/+6
| | | | | | | | | | | | | | R=estade@chromium.org BUG=129125 TEST=Doppleganger text is the same size as other tiles. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10414043 TBR=dbeam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10436009 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138651 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138611 - Add missing initialisation in GaiaOAuthClient::Core.wez@chromium.org2012-05-232-1/+3
| | | | | | | | | | | | | The changes to address crbug.com/128102 contained a bug whereby the caller-supplied OAuth URLs were not stored to the Core, leading to empty URLs being passed to the URLFetcher. Confusingly, this provoked a URLFetcher response code of net::IO_PENDING, so this CL also adds a CHECK() to remoting/host/url_fetcher.cc to ensure that the supplied URL is valid. BUG=129449 Review URL: https://chromiumcodereview.appspot.com/10431005 TBR=wez@chromium.org Review URL: https://chromiumcodereview.appspot.com/10438005 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138649 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 19dharani@chromium.org2012-05-231-0/+19
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138602 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 137020 - Speculative fix for a crash in dtoa.tony@chromium.org2012-05-233-1/+16
| | | | | | | | | | | | | | | This is a patch that FireFox has had for > 5 years. This is just a guess based on where the crash is happening. BUG=123157 TEST=Covered by exising unit tests. Review URL: https://chromiumcodereview.appspot.com/10332147 TBR=tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/10383309 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138547 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 136286 - On a duplicate listener, abort the extension instead of the ↵battre@chromium.org2012-05-232-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | browser process. Currently, ExtensionWebRequestEventRouter::AddEventListener() asserts when instructed to add the same listener twice. This adds: 1. the possibility to let AddEventListener() report to the duplicate, and 2. the ability in WebRequestAddEventListener::RunImpl() to detect this and kill the extension process instead. Item 1. is done by an additional optional argument added to AddEventListener(). Currently, this only works in Release mode. Making it work in Debug is part of a different CL. BUG=115467 TEST=In Release mode, load the extension crash.crx from Issue 115467. It should only kill the extension, not the browser. Review URL: https://chromiumcodereview.appspot.com/10352002 TBR=vabr@chromium.org Review URL: https://chromiumcodereview.appspot.com/10383308 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138542 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138187 - Fix unsafe attempt to blindly access owner() in ↵pkasting@chromium.org2012-05-231-1/+1
| | | | | | | | | | | | | | | GoogleURLTracker::Close(). This was introduced by r135054, which moved some code that derefed owner() up above the check to see whether it was NULL. BUG=128714 TEST=none Review URL: https://chromiumcodereview.appspot.com/10392189 TBR=pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10409096 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138513 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138135 - Fix possible crash in FinalizeInstantQuery() if ↵pkasting@chromium.org2012-05-231-3/+8
| | | | | | | | | | | | | | | AddMatchToMap() fails. It's not clear to me why this is happening frequently. This should only fail if there is no default provider, but if that's true how are we doing instant? ...Whatever. BUG=128575 TEST=none Review URL: https://chromiumcodereview.appspot.com/10392184 TBR=pkasting@chromium.org Review URL: https://chromiumcodereview.appspot.com/10408090 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138512 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 18dharani@chromium.org2012-05-231-0/+19
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138511 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138393 - Make ExtensionTtsPlatformImplWin a leaky singleton to avoid a ↵dmazzoni@chromium.org2012-05-232-1/+5
| | | | | | | | | | | | | | crash in the destructor. BUG=122026 TEST=Does not crash on shutdown on XP. Speech still stops if you load TTS Demo and exit in the middle of a long sentence. Review URL: https://chromiumcodereview.appspot.com/10413054 TBR=dmazzoni@chromium.org Review URL: https://chromiumcodereview.appspot.com/10417055 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138495 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138410 - [Chromoting] Fix full version marker in Keystone ↵garykac@chromium.org2012-05-231-1/+1
| | | | | | | | | | | | | postflight.sh script. BUG=129273 TEST=none Review URL: https://chromiumcodereview.appspot.com/10399138 TBR=garykac@chromium.org Review URL: https://chromiumcodereview.appspot.com/10409089 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138428 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138323 - ppapi: Fix typo when entering FileRef.ihf@chromium.org2012-05-231-2/+2
| | | | | | | | | | | BUG=126794 TEST=Uploaded images to FB using Linux Flash. Review URL: https://chromiumcodereview.appspot.com/10408054 TBR=ihf@chromium.org Review URL: https://chromiumcodereview.appspot.com/10413069 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138427 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 20.0.1132.16chrome-release@google.com2012-05-231-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138417 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 17dharani@chromium.org2012-05-231-0/+18
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138404 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138368 - gdata: Fix a crash when adding a new file to a new but ↵satorux@chromium.org2012-05-224-10/+284
| | | | | | | | | | | | | | | | | | deleted directory. FindDirectoryForNewEntry() was crashing when: 1) a new file is added to a new directory in the same delta feed 2) but the new directory entry is marked "deleted" (moved to trash) BUG=127495 TEST=added a unit test for the fix Review URL: https://chromiumcodereview.appspot.com/10408071 TBR=satorux@chromium.org Review URL: https://chromiumcodereview.appspot.com/10412046 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138388 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138322 - Implement Mac pref-pane UI mockupslambroslambrou@chromium.org2012-05-2210-358/+2566
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the screens to match the mockups. There are two new nib files. One is a view with just a disable button. The other is a view with the PIN-confirmation controls. The main nib has been updated to remove all controls except for the Status text and the padlock. A new placeholder box has been added in the middle of the window, which can show either of the new nibs, depending on whether a new config has been received by the pref-pane. This also fixes some small issues: PIN is reset whenever a new config is sent to the pref-pane - this prevents the previous PIN dots being shown if the user changes PIN a second time without closing the System Preferences applet. The PIN entry box is disabled until the pane is unlocked, for a slightly improved UX. BUG=128813,129032 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10411032 TBR=lambroslambrou@chromium.org Review URL: https://chromiumcodereview.appspot.com/10408076 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138378 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138321 - Chromoting Host installation has to be per-machine, not per-user.alexeypa@google.com2012-05-221-1/+2
| | | | | | | | | | | BUG=129198 Review URL: https://chromiumcodereview.appspot.com/10332298 TBR=alexeypa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10416048 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138375 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138283 - Use existing model for initial layout, if we can.groby@chromium.org2012-05-222-1/+5
| | | | | | | | | | | | BUG=128880 TEST=Try to repro the bug (with an empty profile), see it doesn't happen. Review URL: https://chromiumcodereview.appspot.com/10413044 TBR=groby@chromium.org Review URL: https://chromiumcodereview.appspot.com/10409082 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138373 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138326 - Add app ID to TCP/UDP socket API whitelistwez@chromium.org2012-05-221-1/+2
| | | | | | | | | | | | BUG=129089 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10417023 TBR=wez@chromium.org Review URL: https://chromiumcodereview.appspot.com/10407106 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138363 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138180 - Sandbox policy fixes for all known remaining issues.cevans@chromium.org2012-05-221-4/+14
| | | | | | | | | | BUG=129088 Review URL: https://chromiumcodereview.appspot.com/10383274 TBR=cevans@chromium.org Review URL: https://chromiumcodereview.appspot.com/10388237 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138351 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138191 - net: Fix a regression that broke file uploading with http ↵satorux@chromium.org2012-05-223-2/+60
| | | | | | | | | | | | | | | | | | | | | | | authentication This is a reland of r138168, which was reverted speculatively, but identified unrelated. When uploading a file with http authentication, UploadData is reused for a new UploadDataStream. Hence, we should close the files in UploadData if already opened and read, so we can reread the files from the beginning. The regression was caused by r123677. Special thanks to thomas.themel for identifying the offending patch and helping us to fix the issue. BUG=128574 TEST=added a unit test; manually confirmed that uploading a file with basic authentication, and multi-round authentication with NTLM and Negotiate worked. Review URL: https://chromiumcodereview.appspot.com/10408042 TBR=satorux@chromium.org Review URL: https://chromiumcodereview.appspot.com/10409075 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138337 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 16dharani@chromium.org2012-05-221-0/+20
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138330 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 137560 - zygote: Redirect 64-bit libc localtime and localtime_r routines.satorux@chromium.org2012-05-221-2/+60
| | | | | | | | | | | | | | | BUG=128053 TEST=locally tested on lumpy Review URL: https://chromiumcodereview.appspot.com/10399043 TBR=hshi@chromium.org NOTE: the file was moved from content/browser to content/zygote on trunk. hopefully the patch was applied fine just by tweaking the path. Review URL: https://chromiumcodereview.appspot.com/10408061 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138270 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled more time out tests part 15dharani@chromium.org2012-05-221-0/+19
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138268 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138249 - Sort by type now sorts by localized string representation of ↵satorux@chromium.org2012-05-221-14/+17
| | | | | | | | | | | | | | | | file type. With exception for directories. They come before any file in ascending order. BUG=126941 TEST=Manual test. Review URL: https://chromiumcodereview.appspot.com/10409066 TBR=serya@google.com Review URL: https://chromiumcodereview.appspot.com/10413051 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138262 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 137463 - Attempt at fixing crash in constrained window used by printing. Isky@chromium.org2012-05-222-3/+5
| | | | | | | | | | | | | | | | suspect the page is closing the constrained dialog, which deletes the delegate so that if the dialog attempts to use the delegate we crash. BUG=127370 TEST=none Review URL: https://chromiumcodereview.appspot.com/10383213 TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10421002 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138258 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 135796 - Revert r135533.rohitrao@chromium.org2012-05-2217-145/+53
| | | | | | | | | | | | | | | It broke all content_unittests on mac in debug builds. BUG=121135,126558 TEST=no stack dumps in content_unittests output on mac debug builds TBR=varunjain Review URL: https://chromiumcodereview.appspot.com/10386020 TBR=thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/10416032 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138245 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 137824 - Properly handle accounts that don't have GMail account.sergeyu@chromium.org2012-05-2214-45/+129
| | | | | | | | | | | | | | | | | | | | | 1. Me2MeHostAuthenticatorFactory now verifies that the bare JID of the remote client matches bare JID of the host. Previously it was comparing it with the user's email, which may be different from JID. 2. GaiaOAuthClient now fetches user's email. 3. SignalingConnector verifies that user's email matches the expected value stored in xmpp_login. If it doesn't, then the auth token was generated for a different account and the host treats it as an authentication error. BUG=128102 Review URL: https://chromiumcodereview.appspot.com/10332187 TBR=sergeyu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10413048 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138226 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 138106 - Do not show 'No files match "..."' message when GDrive ↵satorux@chromium.org2012-05-223-4/+9
| | | | | | | | | | | | welcome page is shown. BUG=128811 Review URL: https://chromiumcodereview.appspot.com/10409054 TBR=oleg@chromium.org Review URL: https://chromiumcodereview.appspot.com/10413047 git-svn-id: svn://svn.chromium.org/chrome/branches/1132/src@138225 0039d316-1c4b-4281-b951-d872f2087c98