git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76147 0039d316-1c4b-4281-b951-d872f2087c98

Hack to allow a mismached chrome exe and dll (different versions) to not crash.

The older chrome exe will pass a union, the new chrome dll expects a struct.


BUG=74046
TEST=see bug

Review URL: http://codereview.chromium.org/6598013

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/6598019

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76121 0039d316-1c4b-4281-b951-d872f2087c98

BUG=72173
TEST=none

Review URL: http://codereview.chromium.org/6576032

TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/6598018

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76116 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@76021 0039d316-1c4b-4281-b951-d872f2087c98

This makes sure we do not open a link twice (once due to the handler and once
due to the browser behavior).

BUG=Evan?
TEST=Evan?

Review URL: http://codereview.chromium.org/6250207

TBR=arv@chromium.org
Review URL: http://codereview.chromium.org/6574045

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75984 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75969 - Fix a ChromeFrame crash which occurs in the field typically during upgrades when multiple
ChromeFrame versions are loaded in IE. We have code in ChromeFrame which attempts to fallback
to the older version in case it is already loaded. This is done by creating a named shared memory
block which contains the version of the loaded dll. Newer versions look at this block and fallback
to the older version if any. However due to a small oversight this never worked as the shared
memory block was created unnamed. Thus the fallbacks never occurred leading to multiple
chrome frame binaries attempting to patch urlmon, etc.

Fixes bug http://code.google.com/p/chromium/issues/detail?id=74047
BUG=74047

Review URL: http://codereview.chromium.org/6581045

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/6582003

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75970 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75907 0039d316-1c4b-4281-b951-d872f2087c98

BUG=73893
TEST=PluginGroupTest.MultipleVersions

Review URL: http://codereview.chromium.org/6579004

TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/6578022

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75906 0039d316-1c4b-4281-b951-d872f2087c98

I'll apply this change to all channels.

TBR=aa
BUG=72168
TEST=none

Review URL: http://codereview.chromium.org/6574030

TBR=kathyw@chromium.org
Review URL: http://codereview.chromium.org/6574031

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75897 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75769 - When enabling password sync manually, use the passphrase migration flow to create a passphrase, rather than the confusing "enter your existing passphrase" dialog.

BUG=73791
TEST=see bug

Review URL: http://codereview.chromium.org/6541088

TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/6581023

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75849 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75767 - It's not safe to delete the balloon view during MenuDelegate::StoppedShowing, since it tears down the menu model.  Do this as a delayed task instead.

BUG=51177
TEST=autoclose notification with wrench menu open

Review URL: http://codereview.chromium.org/6541082

TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/6580024

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75848 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75846 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: http://codereview.chromium.org/6579025

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75833 0039d316-1c4b-4281-b951-d872f2087c98

There was an error in hideNotification which prevented us from refreshing the
most visited section.

BUG=71724
TEST=Go to NTP
     Show most visited
     Black list a most visited item
     Now click the restore all link
     The items should be restored

Review URL: http://codereview.chromium.org/6410121

TBR=arv@chromium.org
Review URL: http://codereview.chromium.org/6579022

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75823 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75704 - Fix for the chrome frame anchor url navigation test failures. Fix is to append the anchor
portion of the url retrieved from the navigation manager to the url retrieved from the
protocol sink wrapper. This is needed as the protocol sink wrapper sees the url without
the anchor portion.

BUG=71860
TEST=ChromeFrame anchor url tests.

TBR=amit
Review URL: http://codereview.chromium.org/6546081

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/6579015

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75803 0039d316-1c4b-4281-b951-d872f2087c98

and you hit escape. The regression is the result of converting to
TabContentsWrapper and not updating a set_delegate from
TabContentsWrapper to TabContents.

BUG=72518
TEST=none

Review URL: http://codereview.chromium.org/6523002

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/6574001

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75757 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75746 0039d316-1c4b-4281-b951-d872f2087c98

BUG=73716
TEST=none

Review URL: http://codereview.chromium.org/6549014

TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/6567001

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75722 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75709 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75708 0039d316-1c4b-4281-b951-d872f2087c98

We're seeing a NaN value sometimes get saved (incorrectly)
to the prefs file in the volume setting, which results in
the prefs file being unparseable the next time Chrome
starts, which results in us going through OOBE again.  The
prefs code ought to write NaNs correctly so that they don't
corrupt the file, but in the meantime, this change checks
the return values from a bunch of ALSA functions (my best
theory as to how the NaN is creeping in) and for good
measure, also maps NaN volume values to the minimum volume.

BUG=chromium-os:12229
TEST=built and ran it (i haven't been able to repro the problem)

Review URL: http://codereview.chromium.org/6562001

TBR=derat@chromium.org
Review URL: http://codereview.chromium.org/6562002

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75707 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75702 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75701 0039d316-1c4b-4281-b951-d872f2087c98

Fix a bug in the GPU blacklist.  Originally if we fail to collect driver version, we won't apply blacklist logic.  This will fail us to blacklist ATI cards on linux.

BUG=none
TEST=blacklist all ATI cards on linux.
TBR=zmo

Review URL: http://codereview.chromium.org/6532101

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75682 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75679 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75677 0039d316-1c4b-4281-b951-d872f2087c98

Blacklist GPU features on Windows XP.
Also, gpu blacklist is ignored if use-gl=osmesa; this is for chromium bots.

BUG=72975
TEST=on XP WebGL is disabled

Review URL: http://codereview.chromium.org/6526020

Review URL: http://codereview.chromium.org/6551023

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75676 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75674 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75671 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75656 - If we switch into ChromeFrame as a result of a redirect then we need to navigate chrome to
the correct URL to ensure that scripts on the page see the correct URL. This functionality
regressed when the protocol sink patch landed. 

Fix is to read the URL from the ProtData object which wraps the underlying protocol sink,
when our active document loads.

Removed stale code from the Chromeframe moniker patch which eventually needs to go.

Fixes bug http://code.google.com/p/chromium/issues/detail?can=2&q=71860

BUG=71860
TEST=As described in the bug.

Review URL: http://codereview.chromium.org/6469103

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/6546079

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75665 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75657 0039d316-1c4b-4281-b951-d872f2087c98

Before we lock down (call LowerToken()) we force the IME subsystem to load, so the
required resources are acquired.

Typical sites that show the issue are weathernews.jp and www.nicovideo.jp

BUG=66605
TEST=see bug


Review URL: http://codereview.chromium.org/6551002

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/6541083

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75639 0039d316-1c4b-4281-b951-d872f2087c98

BUG=72496
TEST=see bug


Review URL: http://codereview.chromium.org/6483006

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/6549027

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75638 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75571 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75570 0039d316-1c4b-4281-b951-d872f2087c98

BUG=none
TEST=none
R=bauerb

Review URL: http://codereview.chromium.org/6469076

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75535 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75527 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75526 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75513 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75512 0039d316-1c4b-4281-b951-d872f2087c98