summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 17.0.963.2917.0.963.29gitdeps2014-04-042-490/+300
|
* Incrementing VERSION to 17.0.963.29chrome-release@google.com2012-01-061-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116634 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115412 - sync: don't init TokenService from login_utilstim@chromium.org2012-01-051-4/+12
| | | | | | | | | | | | | | BUG=chromium-os:23689 TEST=Start Chrome OS with login manager in debug build. No DCHECK. (Reverted) Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=115358 Review URL: http://codereview.chromium.org/8980007 TBR=tim@chromium.org Review URL: http://codereview.chromium.org/9008068 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116493 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.28chrome-release@google.com2012-01-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116446 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116277 - Fix a bug with ok callback being called regardless of focus.achuith@chromium.org2012-01-051-15/+11
| | | | | | | | | | | | BUG=chromium-os:24579 TEST=open file manager. launch base dialog by rt click + new folder, or select item + rt click + delete. Tab to Cancel and hit enter. A new folder should not be created, or the file should not be deleted. Review URL: http://codereview.chromium.org/9015041 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/9097002 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116420 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116352 - Happy new year!kerz@chromium.org2012-01-041-1/+1
| | | | | | | | | | | | | BUG=109074 TEST=about:version TBR=thakis Review URL: http://codereview.chromium.org/9008057 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/9093005 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116377 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115892 - [cros] OOBE/Login: Wifi connection dialog is shown again on ↵ivankr@chromium.org2012-01-041-6/+6
| | | | | | | | | | | | | | invalid passphrase. BUG=chromium-os:22735 TEST=Manual: see bug description Review URL: http://codereview.chromium.org/9049005 TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/9087007 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116305 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115896 - [cros] Profile photo caption made multiline.ivankr@chromium.org2012-01-041-3/+0
| | | | | | | | | | | | | BUG=chromium-os:23576 TEST=Manual: see bug description Review URL: http://codereview.chromium.org/9049006 TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/9008065 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116304 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115548 - [cros] OOBE/Login: make 'Sign in' and 'Enter' buttons resizable.ivankr@chromium.org2012-01-041-26/+20
| | | | | | | | | | | | | BUG=chromium-os:24431 TEST=Manual: see bug description Review URL: http://codereview.chromium.org/9020015 TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/9088012 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116303 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115811 - [cros] Pass raw (with dots preserved) user email to Sync setup.ivankr@chromium.org2012-01-041-3/+1
| | | | | | | | | | | | BUG=chromium-os:23807 TEST=Manual: see bug description; no failure should happen on a Debug build when user is first added without dots and then the same user is added with dots in email. Review URL: http://codereview.chromium.org/9026005 TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/9030018 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116302 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.27chrome-release@google.com2012-01-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116275 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.26chrome-release@google.com2012-01-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116225 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114961 - Fix the fullscreen exit bubble's shadow on lion.kerz@chromium.org2012-01-031-2/+10
| | | | | | | | | | | | | | | | | The blur radius parameter to setShadowBlurRadius: has a bigger effect on lion, so we use a smaller value for it. This change also adds a title cased version of the "full screen" UI string. BUG=106798 Review URL: http://codereview.chromium.org/8966014 TBR=koz@chromium.org Review URL: http://codereview.chromium.org/9015038 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116221 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115912 - Ignore empty passphrases in SyncSetupFlow.OnUserConfigured.atwilson@chromium.org2012-01-031-2/+4
| | | | | | | | | | | | | BUG=104189 TEST=see bug Review URL: http://codereview.chromium.org/8989063 TBR=atwilson@chromium.org Review URL: http://codereview.chromium.org/9015037 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116220 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116175 - Pull entity fix from upstream.cevans@chromium.org2012-01-032-1/+2
| | | | | | | | | | BUG=107128 Review URL: http://codereview.chromium.org/9072008 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/9072018 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116214 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114740 - Disk Cache: Discard entries from ReadData if something is ↵rvargas@google.com2012-01-032-2/+38
| | | | | | | | | | | | | | clearly wrong. BUG=107457 TEST=net_unittests Review URL: http://codereview.chromium.org/8913013 TBR=rvargas@chromium.org Review URL: http://codereview.chromium.org/9071021 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116204 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115859 - Avoid an overflow in harfbuzz-myanmar.cinferno@chromium.org2012-01-031-1/+2
| | | | | | | | | | | | | | | | Adds a guard to prevent invalid assignment. BUG=108006 TEST=manually with ASAN. Review URL: http://codereview.chromium.org/8997001 TBR=bashi@chromium.org Review URL: http://codereview.chromium.org/9016057 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116201 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116009 - Have whitespace cleanup for bookmarks happen in ↵zea@chromium.org2012-01-0311-28/+41
| | | | | | | | | | | | | | | | | | | | | | BookmarkNode::SetTitle(..). Previously, BookmarkModel::SetTitle(..) would remove leading/trailing whitespace characters before modifying the bookmark node. This is problematic for any code that directly interacts with bookmark nodes (for example for comparison purposes or when loading bookmark from the persisted file). By having this functionality in the BookmarkNode itself, we ensure consistent titles, and fix a bug where sync could not find bookmarks and ended up duplicating data. BUG=108332 TEST=Add a bookmark with leading/trailing spaces. Enable Sync. Restart. Ensure the bookmark has not duplicated. unit_tests --gtest_filter="*ProfileSyncServiceBookmarkTestWithData*" Review URL: http://codereview.chromium.org/8949053 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/9016054 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116193 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114710 - Exclude extensions and Chrome Web Store from hosted app ↵creis@chromium.org2012-01-032-12/+30
| | | | | | | | | | | | | | | process workaround. BUG=59285 BUG=103263 TEST=Follow a link from a hosted app to an extension or the Chrome Web Store. Review URL: http://codereview.chromium.org/8949021 TBR=creis@chromium.org Review URL: http://codereview.chromium.org/9015029 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116187 0039d316-1c4b-4281-b951-d872f2087c98
* Fix compile breakage. On M17, the method is still called render_view_host()jochen@chromium.org2012-01-031-4/+4
| | | | | | | | | BUG=none TEST=none TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/9075010 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116182 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115899 - Print Preview: Fixing displaying error messages with HTML ↵dpapad@chromium.org2012-01-031-1/+1
| | | | | | | | | | | | | | | content. BUG=108139 TEST=See bug description. Review URL: http://codereview.chromium.org/9041010 TBR=dpapad@chromium.org Review URL: http://codereview.chromium.org/9015034 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116181 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115221 - Remove GAIA desktop shortcut badges when user signs out.stevet@chromium.org2012-01-031-11/+30
| | | | | | | | | | BUG=107363 TEST=Sign in a multi profile account and verify that the GAIA picture is used as the desktop icon badge. Sign out on the same account and ensure that original avatar is reapplied on the badge. Review URL: http://codereview.chromium.org/8996012 Review URL: http://codereview.chromium.org/9015032 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116172 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114814 - Badge the original profile's desktop shortcut and ensure it ↵stevet@chromium.org2012-01-039-21/+92
| | | | | | | | | | | | | | | | is unbadged if it is the last profile left. We do this by fetching the default profile and avatar when the shortcut manager needs to make changes to the default shortcut. We also correct a few places in the original ProfileShortcutManagerWin code to ensure it uses the last remaining profile's details rather than default details. TEST=On a fresh install of Chrome, create a new profile. Ensure that both profiles have the correct badges. BUG=106513,107435 Review URL: http://codereview.chromium.org/8931015 Review URL: http://codereview.chromium.org/9074010 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116171 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116008 - Fix the VPN provider type for L2TP/IPsec certificate-based VPNs.stevenjb@google.com2012-01-031-0/+16
| | | | | | | | | | | | | | | | | | | | | | This CL fixes a regression in the code for determining the VPN provider type for a newly created L2TP/IPsec certificate-based VPN by relying on the temporary connection data kept in NetworkLibraryImplBase. BUG=chromium-os:24578 TEST=Tested L2TP/IPsec VPN with user certificate and pre-shared key as follows: 1. Create a new VPN and it connects successfully. 2. Disconnect the connected VPN and then reconnect successfully. 3. Verify that all information shown in the VPN dialog is correct. 4. Create a new VPN with incorrect server hostname or credentials, and verify that it fails to connect and gives the correct error message. Review URL: http://codereview.chromium.org/9052004 TBR=benchan@chromium.org Review URL: http://codereview.chromium.org/9015030 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116168 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114022 - Add a policy pref for the --enable-memory-info flag.mmoss@chromium.org2012-01-0311-2/+30
| | | | | | | | | | | | | BUG=43281 TEST=Setting pref has same effect as running with --enable-memory-info. Review URL: http://codereview.chromium.org/8896018 TBR=mmoss@chromium.org Review URL: http://codereview.chromium.org/9076001 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116163 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115988 - Make webstore installs work when the Downloads folder is missing.asargent@chromium.org2012-01-033-3/+49
| | | | | | | | | | | | | | | BUG=108812 TEST=Install chrome on a machine that doesn't already have a Downloads folder (or delete the existing folder). Then try and install an extension or app from the webstore. Review URL: http://codereview.chromium.org/9022032 TBR=asargent@chromium.org Review URL: http://codereview.chromium.org/9072010 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116157 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116101 - Correctly report new navigation targets in incognito profilesjochen@chromium.org2012-01-038-8/+221
| | | | | | | | | | | | | BUG=107147 TEST=browser_tests:ExtensionApiTest.WebNavigationTargetBlank* Review URL: http://codereview.chromium.org/9028005 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/9014016 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116154 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116103 - win/diagnostic mode: Restore "Press [enter] to continue" prompt.thakis@chromium.org2012-01-031-1/+2
| | | | | | | | | | | | | | | I accidentally removed this in http://crrev.com/r111561 BUG=108934 TEST=none Review URL: http://codereview.chromium.org/9066004 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/9071011 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116152 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115038 - Fix crash in cloud print dialog on Mac.abodenha@chromium.org2012-01-032-9/+12
| | | | | | | | | | | | | | | Use TabContentsWrapper in the Mac version of html dialogs instead of using TabContents directly like on Windows and Linux. BUG=107437 TEST= Review URL: http://codereview.chromium.org/8980004 TBR=abodenha@chromium.org Review URL: http://codereview.chromium.org/9023023 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116151 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115893 - Fixes possible crash that occurs if we attempt to set ↵sky@chromium.org2012-01-031-1/+4
| | | | | | | | | | | | | | | | selection model to empty when it isn't empty. BUG=107786 TEST=see bug. Review URL: http://codereview.chromium.org/8984002 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/9075004 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116145 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.25chrome-release@google.com2012-01-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116116 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114806 - Include the information whether the tab is already in a tab ↵jochen@chromium.org2012-01-0210-49/+81
| | | | | | | | | | | | | | strip with the retargeting details BUG=107759 TEST=added a DCHECK. Without the fix, the DCHECK would trigger in ExtensionApiTest.WebNavigationOpenTab Review URL: http://codereview.chromium.org/8964014 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/9068001 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116089 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.24chrome-release@google.com2012-01-011-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116073 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 116028 - Delay some extension startup until after first run import.yoz@chromium.org2012-01-012-11/+47
| | | | | | | | | | | | | BUG=108286 TEST=Start chrome with first run, see if default apps are installed. Restart chrome and see if they're still installed. TBR=aa@chromium.org Review URL: http://codereview.chromium.org/9053005 TBR=yoz@chromium.org Review URL: http://codereview.chromium.org/9060001 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116068 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115425 - Only install default apps for new profiles.yoz@chromium.org2012-01-011-11/+22
| | | | | | | | | | | | | | BUG=108286 TEST=Install M15 then update the build to M16. Make sure that default apps are not installed in any profile. Test with a profile that already has apps installed and with a profile that has no apps already installed. Review URL: http://codereview.chromium.org/8999012 TBR=rogerta@chromium.org Review URL: http://codereview.chromium.org/9007065 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116067 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.23chrome-release@google.com2011-12-301-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116021 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.22chrome-release@google.com2011-12-291-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115945 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115514 - [Sync] Ensure encryption happens before syncing with the server.zea@chromium.org2011-12-281-5/+8
| | | | | | | | | | | | | BUG=108105 TEST= Review URL: http://codereview.chromium.org/9017033 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8956060 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115917 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115717 - WebRequest API documentation reviewbattre@chromium.org2011-12-283-377/+302
| | | | | | | | | | | | BUG=108541 TEST=no Review URL: http://codereview.chromium.org/8729027 TBR=battre@chromium.org Review URL: http://codereview.chromium.org/9008037 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115880 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.21chrome-release@google.com2011-12-281-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115863 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114608, 115692 to 963 (M17) branch.dbeam@chromium.org2011-12-2816-147/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | [Sync Promo UI] Changing sync promo to honor brand codes. Also, this CL moves chrome/browser/ui/webui/sync_promo_* to chrome/browser/ui/webui/sync_promo/sync_promo_*. BUG=107223 R=stevet@chromium.org,rogerta@chromium.org,sail@chromium.org TEST=The sync promo responds to brand code and records results of the field trial correctly. Review URL: http://codereview.chromium.org/8933003 [Sync Promo UI] Change data reporting to differentiate between startup and other means of getting to the full page sync promo. R=stevet@chromium.org,sail@chromium.org TEST=about:histograms, Ctrl+f "WithBrand" BUG=107223 Review URL: http://codereview.chromium.org/9007041 Review URL: http://codereview.chromium.org/8992034 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115861 0039d316-1c4b-4281-b951-d872f2087c98
* Fix pepper string var leaks for M17.dmichael@chromium.org2011-12-273-0/+12
| | | | | | | | | | | I had to do a manual merge because message_channel.cc has changed too much for drover to handle. Original/trunk CL: http://codereview.chromium.org/8982006 BUG=108308,108314 TEST= Review URL: http://codereview.chromium.org/9016044 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115844 0039d316-1c4b-4281-b951-d872f2087c98
* name=leaksdmichael@chromium.org2011-12-271-0/+67
| | | | | | | | | | | | issue=9016044 bot=win,mac,linux user=dmichael patchset=1 root=src email=dmichael@chromium.org git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115841 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 113643 - Call NotifyObservers() after setting sync setup completed.stevenjb@google.com2011-12-271-0/+1
| | | | | | | | | | | | | | The UI behavior changes once HasSyncSetupCompleted() returns true, so we need to notify observers when we set this in OnBackendInitialized(). BUG=chromium-os:23151 TEST=See issue. Also make sure error clears correctly and is set correctly for other sync errors. Review URL: http://codereview.chromium.org/8876001 TBR=stevenjb@google.com Review URL: http://codereview.chromium.org/9046008 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115836 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 114653 - Attempt at fixing tab dragging crash. I believe the crash is ↵kerz@chromium.org2011-12-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | happening because there is an existing TabDragController when a new one is created. Right after we create the new TabDragController it replaces the old, but if we create the new one before the old is destroyed it means the old is still set as a delegate on the TabContents so that when the new restores the delegates it restores the old TabDragController, which has now been deleted. BUG=107172 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8915026 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/9041011 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115834 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.20chrome-release@google.com2011-12-271-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115802 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 113701 - [filebrowser] Fix the browser_tests using invalid mount point.dgozman@chromium.org2011-12-262-7/+35
| | | | | | | | | | | | BUG=chromium-os:23809 TEST=SelectFileDialogExtensionBrowserTest.* Review URL: http://codereview.chromium.org/8819025 TBR=dgozman@chromium.org Review URL: http://codereview.chromium.org/9042004 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115795 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 17.0.963.19chrome-release@google.com2011-12-231-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115676 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 115189 - Don't delete the current NavigationEntry when leaving an ↵creis@chromium.org2011-12-226-98/+94
| | | | | | | | | | | | | | interstitial page. BUG=107182 TEST=See bug Review URL: http://codereview.chromium.org/8976014 TBR=creis@chromium.org Review URL: http://codereview.chromium.org/9023016 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115624 0039d316-1c4b-4281-b951-d872f2087c98
* Another logic fix that needed to be backported to M17.kbr@chromium.org2011-12-221-25/+0
| | | | | | | | | | | Original CL: http://codereview.chromium.org/8698008/ . BUG=106891 TEST=browser_tests (on bots) TBR=kerz Review URL: http://codereview.chromium.org/9022018 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@115612 0039d316-1c4b-4281-b951-d872f2087c98