summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 16.0.912.2716.0.912.27gitdeps2014-04-042-454/+261
|
* Incrementing VERSION to 16.0.912.27chrome-release@google.com2011-11-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108761 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107820 - [Sync] Ensure new non-frontend datatypes release shared ↵zea@chromium.org2011-11-043-9/+35
| | | | | | | | | | | | | | | | | | change processor If we failed to startup, Stop() doesn't get called, so ensure we cleanup up properly in StartDoneImpl. BUG=102009 TEST=unit_tests Review URL: http://codereview.chromium.org/8341091 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8481017 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108745 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108620 - Add only types with empty progress marker to config requests. ↵lipalani@chromium.org2011-11-043-6/+50
| | | | | | | | | | | | | | | | | | This fixes a bug where in case of a newly enabled datatype we would end up adding all the datatypes to the config request. With this change Nigori would not be part of the requested types unless it has progress marker token to be empty. So we should not get migration error on config requests at all. In case we do it would be a unrecoverable error which is fine. BUG=102557 TEST= Review URL: http://codereview.chromium.org/8439057 TBR=lipalani@chromium.org Review URL: http://codereview.chromium.org/8477016 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108729 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108576 - Avoid processing two GetStateFast messages back to back.jbauman@chromium.org2011-11-042-3/+24
| | | | | | | | | | | | | | Require that one non-getstatefast message be processed in between, to prevent starvation. BUG=102214 TEST= Review URL: http://codereview.chromium.org/8440061 TBR=jbauman@chromium.org Review URL: http://codereview.chromium.org/8480019 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108728 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108050 - Adjust fragment indices appropriately when pasting HTML on ↵dcheng@chromium.org2011-11-042-3/+35
| | | | | | | | | | | | | | | Windows. BUG=102406 TEST=Copy a long, complex document from docs.google.com and paste into a Gmail compose window. Review URL: http://codereview.chromium.org/8429022 TBR=dcheng@chromium.org Review URL: http://codereview.chromium.org/8479018 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108727 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 16.0.912.26chrome-release@google.com2011-11-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108610 0039d316-1c4b-4281-b951-d872f2087c98
* net: block Digicert Sdn. Bhd. on M16.agl@chromium.org2011-11-031-2/+12
| | | | | | | | | | This won't go out until next week so this patch blocks both intermediate certificates held by Digicert Sdn. Bhd. BUG=102530 TEST=Check that https://mmail.esyariah.gov.my fails with a revocation error (until the site updates) git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108563 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107888 - Fix the "certificate is not yet valid" error for server ↵wtc@chromium.org2011-11-0313-3/+449
| | | | | | | | | | | | | | | | | | | | | | | | | certificates issued by a VeriSign intermediate CA. Change the CertVerifier cache to identify a certificate chain by the hash of the entire chain rather than just the server certificate. This requires adding X509Certificate::chain_fingerprint(), and the X509Certificate::CalculateChainFingerprint() method to compute the chain fingerprint. R=agl@chromium.org,rsleevi@chromium.org BUG=101555 TEST=X509CertificateTest.ChainFingerprints and CertVerifierTest.DifferentCACerts in net_unittests Review URL: http://codereview.chromium.org/8400075 TBR=wtc@chromium.org Review URL: http://codereview.chromium.org/8378006 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108542 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108409 - [Sync] Ensure nigori node always has encryption keys.zea@chromium.org2011-11-032-18/+69
| | | | | | | | | | | | | BUG=102526 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/8438015 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8436005 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108541 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 108530 - Merge 108409 - [Sync] Ensure nigori node always has ↵zea@chromium.org2011-11-032-69/+18
| | | | | | | | | | | | | | | | | | encryption keys. BUG=102526 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/8438015 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8417052 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8430044 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108538 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108498 - Wait for the tab opened by the extension to be loaded before ↵jochen@chromium.org2011-11-031-2/+6
| | | | | | | | | | | | | | | | | navigating it Turns out that a precondition for NavigateToURL is that the tab is currently not navigating. While about:blank loads very quickly, on slow machines it might take to long, so NavigateToURL fails BUG=101078 TEST=ExtensionApiTest.WebNavigationUserAction doesn't time out on official mac builders Review URL: http://codereview.chromium.org/8334023 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/8443003 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108535 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108409 - [Sync] Ensure nigori node always has encryption keys.zea@chromium.org2011-11-032-18/+69
| | | | | | | | | | | | | BUG=102526 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/8438015 TBR=zea@chromium.org Review URL: http://codereview.chromium.org/8417052 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108530 0039d316-1c4b-4281-b951-d872f2087c98
* Flip mixed content blocking infobar setting.tsepez@chromium.org2011-11-031-1/+1
| | | | | | | BUG=102893 Review URL: http://codereview.chromium.org/8447011 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108529 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108338 - Fix crash on unsupported pixel formats.dalecurtis@google.com2011-11-031-1/+1
| | | | | | | | | | | | | | | | | Replaces the NOTREACHED() calls with DLOG(WARNING), avoids creating frames when invalid pixel formats are detected, and finally calls OnInitializeComplete(false) in FFmpegVideoDecodeEngine::Initialize. BUG=101803 TEST=Ran unittests. Ran test video. Review URL: http://codereview.chromium.org/8437021 TBR=dalecurtis@chromium.org Review URL: http://codereview.chromium.org/8436003 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108526 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108338 - Fix crash on unsupported pixel formats.dalecurtis@google.com2011-11-031-1/+0
| | | | | | | | | | | | | | | | | Replaces the NOTREACHED() calls with DLOG(WARNING), avoids creating frames when invalid pixel formats are detected, and finally calls OnInitializeComplete(false) in FFmpegVideoDecodeEngine::Initialize. BUG=101803 TEST=Ran unittests. Ran test video. Review URL: http://codereview.chromium.org/8437021 TBR=dalecurtis@chromium.org Review URL: http://codereview.chromium.org/8437101 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108524 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108338 - Fix crash on unsupported pixel formats.dalecurtis@google.com2011-11-033-18/+34
| | | | | | | | | | | | | | | | | Replaces the NOTREACHED() calls with DLOG(WARNING), avoids creating frames when invalid pixel formats are detected, and finally calls OnInitializeComplete(false) in FFmpegVideoDecodeEngine::Initialize. BUG=101803 TEST=Ran unittests. Ran test video. Review URL: http://codereview.chromium.org/8437021 TBR=dalecurtis@chromium.org Review URL: http://codereview.chromium.org/8437097 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108506 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 16.0.912.25chrome-release@google.com2011-11-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108436 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108374 - Open cros filemanager when "Open Downloads Folder" is clicked.achuith@chromium.org2011-11-031-0/+8
| | | | | | | | | | | BUG=chromium-os:21585 TEST=On ChromeOS, ctrl-j for the downloads page, click on Open Downloads Folder to have a new tab open with the filemanager extension positioned in the Downloads folder. Review URL: http://codereview.chromium.org/8439018 TBR=achuith@chromium.org Review URL: http://codereview.chromium.org/8372091 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108408 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 16.0.912.24chrome-release@google.com2011-11-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108402 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108372 - Sync promo: Re-enabling UMA tracking of advanced clicks.dbeam@chromium.org2011-11-031-0/+1
| | | | | | | | | | | | | | BUG=97820 TEST=We start getting advanced clicks in Sync Promo's UMA. R=sail@chromium.org Review URL: http://codereview.chromium.org/8386058 TBR=dbeam@chromium.org Review URL: http://codereview.chromium.org/8423070 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108384 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107841 - Fix a crash in FullscreenExitBubbleController when the user ↵jeremya@chromium.org2011-11-025-6/+70
| | | | | | | | | | | | | | | | | clicks the "Exit full screen" button. The crash was due to the fact that Browser::OnDenyFullscreenPermission causes BrowserWindow::ExitFullscreen to be called, which causes the FullscreenExitBubbleController to be destroyed. [FullscreenExitBubbleController deny:] was sending a -hideSoon message to its zombie self following the call to Browser::OnDenyFullscreenPermission. BUG=101835 TEST=The browser doesn't crash when you click "Exit full screen" on a fullscreened page. Review URL: http://codereview.chromium.org/8399017 TBR=jeremya@chromium.org Review URL: http://codereview.chromium.org/8351086 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108353 0039d316-1c4b-4281-b951-d872f2087c98
* Backport HSTS fixes to M16.cevans@chromium.org2011-11-023-118/+288
| | | | | | | BUG=102710,102456 Review URL: http://codereview.chromium.org/8440054 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108351 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107671 - Disable SPDY IP pooling for SSL connections with client ↵wtc@chromium.org2011-11-0212-9/+122
| | | | | | | | | | | | | | | | | | authentication. Add a "bool client_cert_sent" member to SSLInfo to extract this info from SSLClientSocket. R=rtenneti@chromium.org BUG=101778 TEST=new unit test Review URL: http://codereview.chromium.org/8401024 TBR=wtc@chromium.org Review URL: http://codereview.chromium.org/8438055 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108350 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 8401001 r107836 into branch 912: Fix history importing by delaying ↵benjhayden@chromium.org2011-11-0233-162/+224
| | | | | | | | | | | | | | | | | | | DownloadManager creation. Replace GetNextIdThunkType with DownloadIdFactory (RefCountedThreadSafe, created by DownloadService). DownloadService uses the same DownloadIdFactory for an OTR profile as its original profile. DownloadService passes the DownloadIdFactory into the DownloadManager so that the DownloadManager can allocate new valid ids for items loaded from the history or downloads started on the ui thread. Since the DownloadService precedes and outlives its DownloadManager, DownloadManager does not have a scoped_refptr<DownloadIdFactory>. Objects that do have a scoped_refptr<DownloadIdFactory>: DownloadService, ProfileIOData, ShellBrowserContext, ShellResourceContext. The DownloadIdFactory must be RefCountedThreadSafe because ProfileIOData outlives Profile and because it's used in both the OTR and original profiles. Longer term, the import process should strictly precede profile initialization, and the next_download_id counter should be loaded from the History db strictly before DownloadService is created and creates a DownloadIdFactory. BUG=98966 Review URL: http://codereview.chromium.org/8372073 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108346 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108010 - Relanding this.ananta@chromium.org2011-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | Fix a ChromeFrame crash which occurs in the background worker thread while dereferencing a NULL automation client. This crash occurs when the active document is in the process of shutting down while there are active background requests still pending. Fix is to ensure that the background thread has been stopped before returning from the UrlmonUrlRequestManager::StopAll function which gets called during CF shutdown. Fixes bug http://code.google.com/p/chromium/issues/detail?id=102393 BUG=102393 TBR=robertshield Review URL: http://codereview.chromium.org/8384019 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/8439052 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108344 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108181 - Change linux NAT traversal default for Chromoting.dmaclach@chromium.org2011-11-021-12/+0
| | | | | | | | | | | | | | | | The NAT traversal default for all platforms is now true. BUG=97689 TEST=None Review URL: http://codereview.chromium.org/8423020 TBR=dmaclach@chromium.org Review URL: http://codereview.chromium.org/8386050 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108332 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 107492 - Merge 107491 - Disable sync promosail@chromium.org2011-11-021-1/+2
| | | | | | | | | | | | | | | | BUG=101251 TEST= TBR=dbeam@chromium.org Review URL: http://codereview.chromium.org/8404015 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/8402013 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/8386046 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108324 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108241 - Align edge of sync sign in bubblesail@chromium.org2011-11-022-14/+37
| | | | | | | | | | | | | | Screenshot: http://imgur.com/QToj7 BUG=101057 TEST= Review URL: http://codereview.chromium.org/8372031 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/8437061 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108323 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108240 - Sync Promo: Show sign in confirmation bubble in NTPsail@chromium.org2011-11-0213-15/+311
| | | | | | | | | | | | | | | | | To make it clear what's happening we want to show a "signed into sync" confirmation bubble in NTP. We only show this bubble for users who signed in using the sync promo page. Screenshots of the bubble: http://www.dropmocks.com/mbiqd BUG=101057 TEST= Review URL: http://codereview.chromium.org/8396024 TBR=sail@chromium.org Review URL: http://codereview.chromium.org/8386045 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108322 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107818 - Associate the instant label text with a specific checkbox.sreeram@chromium.org2011-11-022-1/+3
| | | | | | | | | | | | | | | | | I've tested this using all combinations of field trials (both naturally selected as well as forced through the --instant-field-trial commandline switch), and everything works as expected. BUG=101930 TEST=Clicking on the label text should turn the checkbox on/off. Review URL: http://codereview.chromium.org/8400044 TBR=sreeram@chromium.org Review URL: http://codereview.chromium.org/8438044 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108316 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107396 - Set bounds of download shelf drop down menu so that it ↵asanka@chromium.org2011-11-023-23/+21
| | | | | | | | | | | | | | | doesn't overlap the button. BUG=101080 TEST=Download shelf drop down menu is positioned above or below the item view area, but not over it. Review URL: http://codereview.chromium.org/8392029 TBR=asanka@chromium.org Review URL: http://codereview.chromium.org/8437054 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108292 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 108233 - Merge 107841 - Fix a crash in FullscreenExitBubbleController ↵laforge@chromium.org2011-11-025-64/+6
| | | | | | | | | | | | | | | | | | | | when the user clicks the "Exit full screen" button. The crash was due to the fact that Browser::OnDenyFullscreenPermission causes BrowserWindow::ExitFullscreen to be called, which causes the FullscreenExitBubbleController to be destroyed. [FullscreenExitBubbleController deny:] was sending a -hideSoon message to its zombie self following the call to Browser::OnDenyFullscreenPermission. BUG=101835 TEST=The browser doesn't crash when you click "Exit full screen" on a fullscreened page. Review URL: http://codereview.chromium.org/8399017 TBR=jeremya@chromium.org Review URL: http://codereview.chromium.org/8439030 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/8440041 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108290 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107901 - Options: Fix to enable Edit button only when the current ↵mirandac@chromium.org2011-11-021-1/+2
| | | | | | | | | | | | | | | profile is selected. Prevents a profile from editing the avatar and profile name of another profile in the Personal Options page. These changes got overwritten due to revision 107894. Bringing them back. BUG=87658 TEST=NONE Review URL: http://codereview.chromium.org/8341139 TBR=qghc36@motorola.com Review URL: http://codereview.chromium.org/8386035 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108283 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107894 - Options: Disable the delete button when no profile is ↵mirandac@chromium.org2011-11-021-7/+16
| | | | | | | | | | | | | | | | | selected in personal settings. According to this change, Delete button will be disabled when there are multiple profiles and none of the profiles is selected. If profile list is hidden i.e if there is only one default profile then Delete Button is also disabled. BUG=100625 TEST='Delete...' button should be disabled when no profile is selected in chrome://settings/personal page. Review URL: http://codereview.chromium.org/8339014 TBR=qghc36@motorola.com Review URL: http://codereview.chromium.org/8386034 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108282 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108089 - [cros] Fix OOBE image selection screen title.ivankr@chromium.org2011-11-021-1/+3
| | | | | | | | | | | | BUG=chromium-os:22001 TEST=Manual: title of the OOBE image selection screen should offer to choose, not to change, a picture. Review URL: http://codereview.chromium.org/8433002 TBR=ivankr@chromium.org Review URL: http://codereview.chromium.org/8423036 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108253 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 16.0.912.23chrome-release@google.com2011-11-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108251 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108133 - Disable testAboutAppCacheTabnirnimesh@chromium.org2011-11-021-0/+2
| | | | | | | | | | | | | | | | The external webpage used by this test is throwing 500. TBR=dennisjeffrey@chromium.org R=dennisjeffrey@chromium.org BUG=102517 TEST= Review URL: http://codereview.chromium.org/8423012 TBR=nirnimesh@chromium.org Review URL: http://codereview.chromium.org/8372054 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108249 0039d316-1c4b-4281-b951-d872f2087c98
* Additional stats for detection of default search provider change.avayvod@chromium.org2011-11-021-4/+33
| | | | | | | | | | Fixed signing and verification of signature. BUG=101815,102480 TEST=Check that corresponding histograms are updated as intended. Review URL: http://codereview.chromium.org/8386004 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108247 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108214 - Try to fix a renderer crash.thakis@chromium.org2011-11-021-4/+4
| | | | | | | | | | | | | | | | | WebRange::fromDocumentRange() can return a null range. I don't know when this happens in practice, but there are crash reports for it. BUG=100884 TEST=none Review URL: http://codereview.chromium.org/8423022 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/8438029 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108243 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107841 - Fix a crash in FullscreenExitBubbleController when the user ↵cevans@chromium.org2011-11-025-6/+64
| | | | | | | | | | | | | | | | | clicks the "Exit full screen" button. The crash was due to the fact that Browser::OnDenyFullscreenPermission causes BrowserWindow::ExitFullscreen to be called, which causes the FullscreenExitBubbleController to be destroyed. [FullscreenExitBubbleController deny:] was sending a -hideSoon message to its zombie self following the call to Browser::OnDenyFullscreenPermission. BUG=101835 TEST=The browser doesn't crash when you click "Exit full screen" on a fullscreened page. Review URL: http://codereview.chromium.org/8399017 TBR=jeremya@chromium.org Review URL: http://codereview.chromium.org/8439030 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108233 0039d316-1c4b-4281-b951-d872f2087c98
* Incrementing VERSION to 16.0.912.22chrome-release@google.com2011-11-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108231 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 106566 - ntp4: fix 'undo' link in most visited trash notificationestade@chromium.org2011-11-021-4/+4
| | | | | | | | | | | | | BUG=100423 TEST=manual Review URL: http://codereview.chromium.org/8353024 TBR=estade@chromium.org Review URL: http://codereview.chromium.org/8437037 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108229 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108158 - Update version metadata for Flash, Reader, Shockwave.cevans@chromium.org2011-11-021-6/+10
| | | | | | | | | | BUG=81293 Review URL: http://codereview.chromium.org/8440010 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/8423032 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108225 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108143 - Update JRE version metadata.cevans@chromium.org2011-11-021-5/+9
| | | | | | | | | | BUG=102461 Review URL: http://codereview.chromium.org/8428011 TBR=cevans@chromium.org Review URL: http://codereview.chromium.org/8439027 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108223 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107430 - Add Remoting Host plugin to linux/SYMBOLS.lambroslambrou@google.com2011-11-021-0/+2
| | | | | | | | | | | | BUG=87632 TEST=Check official build logs Review URL: http://codereview.chromium.org/8394064 TBR=lambroslambrou@google.com Review URL: http://codereview.chromium.org/8423030 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108222 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107252 - Add remoting_linux_symbols target.lambroslambrou@google.com2011-11-021-0/+40
| | | | | | | | | | | | | | | | Add GYP target for building Breakpad symbols for Remoting Host plugin on Linux. BUG=87632 TEST=Manual: "build/gyp_chromium --check", and build new target. Review URL: http://codereview.chromium.org/8390015 TBR=lambroslambrou@chromium.org Review URL: http://codereview.chromium.org/8438027 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108221 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108014 - [Web UI Options] For overlays that have >1 button-strip, ↵binji@chromium.org2011-11-021-7/+8
| | | | | | | | | | | | | | | reverse order of all (in views). BUG=102303 TEST=Run views chrome. Go to chrome://settings/personal. Sign in to sync. Click "Advanced". OK button should be on left. In non-views chrome (mac, linux), OK button should be on right. Review URL: http://codereview.chromium.org/8387033 TBR=binji@chromium.org Review URL: http://codereview.chromium.org/8351061 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108220 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 108137 - Add warning to Mac that passwords are shared between profiles ↵mirandac@chromium.org2011-11-025-0/+19
| | | | | | | | | | | | | | through the underlying keychain. BUG=102176 TEST=on Mac, with more than one profile existing, a warning is shown on the settings/personal page about profile password sharing. Review URL: http://codereview.chromium.org/8430017 TBR=mirandac@chromium.org Review URL: http://codereview.chromium.org/8438026 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108218 0039d316-1c4b-4281-b951-d872f2087c98
* Merge 107745 - [Mac] Show the edit profile link after a dwell delay so that ↵rsesek@chromium.org2011-11-023-11/+66
| | | | | | | | | | | | | | | it doesn't flicker when scrubbing. BUG=100856 TEST=Quickly mouse through the avatar menu. The edit link doesn't flicker. Review URL: http://codereview.chromium.org/8344048 TBR=rsesek@chromium.org Review URL: http://codereview.chromium.org/8437031 git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108215 0039d316-1c4b-4281-b951-d872f2087c98