diff options
author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 20:31:18 +0000 |
---|---|---|
committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 20:31:18 +0000 |
commit | d6cbd42672ac02cd96ee7724e721803f3e2bd5cc (patch) | |
tree | a97d4c3127d589c132536d894a2f43e8c7eeab25 /o3d | |
parent | df90ba06a5dcdaf2e78a3223420420eed4ae8b74 (diff) | |
download | chromium_src-d6cbd42672ac02cd96ee7724e721803f3e2bd5cc.zip chromium_src-d6cbd42672ac02cd96ee7724e721803f3e2bd5cc.tar.gz chromium_src-d6cbd42672ac02cd96ee7724e721803f3e2bd5cc.tar.bz2 |
add Opera to the list of agents that work okay with O3D (as Opera 11.0)
BUG=68593
TEST=use google talk video in opera 11. Should work without warning if you enable labs 'Google Talk Enhancements'
Review URL: http://codereview.chromium.org/6066009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r-- | o3d/plugin/win/config.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/o3d/plugin/win/config.cc b/o3d/plugin/win/config.cc index aa99482..b1d28fe 100644 --- a/o3d/plugin/win/config.cc +++ b/o3d/plugin/win/config.cc @@ -1,5 +1,5 @@ /* - * Copyright 2009, Google Inc. + * Copyright 2011, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,7 +71,7 @@ bool CheckOSVersion(NPP npp) { if (!AskUser(npp, error)) return false; } } else if (version.dwMajorVersion > 5 || - (version.dwMajorVersion == 5 && version.dwMinorVersion >= 2)) { + (version.dwMajorVersion == 5 && version.dwMinorVersion >= 2)) { // 6.0 is Vista or Server 2008; it's now worth a try. } else { std::string error = std::string("Unsupported Windows version."); @@ -85,7 +85,8 @@ bool CheckUserAgent(NPP npp, const std::string &user_agent) { if (user_agent.find("Firefox") == user_agent.npos && user_agent.find("Chrome") == user_agent.npos && user_agent.find("MSIE") == user_agent.npos && - user_agent.find("Safari") == user_agent.npos) { + user_agent.find("Safari") == user_agent.npos && + user_agent.find("Opera") == user_agent.npos) { std::string error = std::string("Unsupported user agent: ") + user_agent; return AskUser(npp, error); } |