Committing http://codereview.chromium.org/3420004/show for grt@...

chrome_frame/utils.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 #include <wininet.h>
 
 #include <atlsecurity.h>
@@ skipping 340 matching lines @@
   //  while the module's refcount is > 0.  Only do this when we're being
   //  used as an NPAPI module.
   _pAtlModule->Lock();
 }
 
 
 AddRefModule::~AddRefModule() {
   _pAtlModule->Unlock();
 }
 
+bool IsChrome(RendererType renderer_type) {
+  DCHECK_GE(renderer_type, RENDERER_TYPE_UNDETERMINED);
+  DCHECK_LE(renderer_type, RENDERER_TYPE_OTHER);
+  return renderer_type >= RENDERER_TYPE_CHROME_MIN &&
+    renderer_type <= RENDERER_TYPE_CHROME_MAX;
+}
+
 namespace {
 const char kIEImageName[] = "iexplore.exe";
 const char kFirefoxImageName[] = "firefox.exe";
 const char kOperaImageName[] = "opera.exe";
 }  // namespace
 
 std::wstring GetHostProcessName(bool include_extension) {
   FilePath exe;
   if (PathService::Get(base::FILE_EXE, &exe))
     exe = exe.BaseName();
@@ skipping 42 matching lines @@
       uint32 high = 0;
       uint32 low  = 0;
       if (GetModuleVersion(mod, &high, &low)) {
         switch (HIWORD(high)) {
           case 6:
             ie_version = IE_6;
             break;
           case 7:
             ie_version = IE_7;
             break;
+          case 8:
+            ie_version = IE_8;
+            break;
           default:
-            ie_version = HIWORD(high) >= 8 ? IE_8 : IE_UNSUPPORTED;
+            ie_version = HIWORD(high) >= 9 ? IE_9 : IE_UNSUPPORTED;
             break;
         }
       } else {
         NOTREACHED() << "Can't get IE version";
       }
     }
   }
 
   return ie_version;
 }
@@ skipping 268 matching lines @@
     // checked frequently.
     RegKey config_key;
     if (config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_READ)) {
       config_key.ReadValueDW(kEnableGCFRendererByDefault, &is_default);
     }
   }
 
   return is_default != 0;
 }
 
-bool IsOptInUrl(const wchar_t* url) {
+RendererType RendererTypeForUrl(const std::wstring& url) {
   // First check if the default renderer settings are specified by policy.
   // If so, then that overrides the user settings.
   Singleton<PolicySettings> policy;
-  PolicySettings::RendererForUrl renderer = policy->GetRendererForUrl(url);
+  PolicySettings::RendererForUrl renderer = policy->GetRendererForUrl(
+      url.c_str());
   if (renderer != PolicySettings::RENDERER_NOT_SPECIFIED) {
-    return (renderer == PolicySettings::RENDER_IN_CHROME_FRAME);
+    // We may know at this point that policy says do NOT render in Chrome Frame.
+    // To maintain consistency, we return RENDERER_TYPE_UNDETERMINED so that
+    // content sniffing, etc. still take place.
+    // TODO(tommi): Clarify the intent here.
+    return (renderer == PolicySettings::RENDER_IN_CHROME_FRAME) ?
+        RENDERER_TYPE_CHROME_OPT_IN_URL : RENDERER_TYPE_UNDETERMINED;
   }
 
   RegKey config_key;
   if (!config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_READ))
-    return false;
+    return RENDERER_TYPE_UNDETERMINED;
 
-  bool load_in_chrome_frame = false;
+  RendererType renderer_type = RENDERER_TYPE_UNDETERMINED;
 
   const wchar_t* url_list_name = NULL;
   int render_in_cf_by_default = FALSE;
   config_key.ReadValueDW(kEnableGCFRendererByDefault,
                          reinterpret_cast<DWORD*>(&render_in_cf_by_default));
   if (render_in_cf_by_default) {
     url_list_name = kRenderInHostUrlList;
-    load_in_chrome_frame = true;  // change the default to true.
+    renderer_type = RENDERER_TYPE_CHROME_DEFAULT_RENDERER;
   } else {
     url_list_name = kRenderInGCFUrlList;
   }
 
   bool match_found = false;
   RegistryValueIterator url_list(config_key.Handle(), url_list_name);
   while (!match_found && url_list.Valid()) {
     if (MatchPattern(url, url_list.Name())) {
       match_found = true;
     } else {
       ++url_list;
     }
   }
 
   if (match_found) {
-    // The lists are there to opt out of whatever is the default.
-    load_in_chrome_frame = !load_in_chrome_frame;
+    renderer_type = render_in_cf_by_default ?
+      RENDERER_TYPE_UNDETERMINED :
+      RENDERER_TYPE_CHROME_OPT_IN_URL;
   }
 
-  return load_in_chrome_frame;
+  return renderer_type;
 }
 
 HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
                                  const wchar_t* headers, IBindCtx* bind_ctx,
                                  const wchar_t* fragment) {
   DCHECK(browser);
   DCHECK(moniker);
   DCHECK(bind_ctx);
 
   ScopedComPtr<IWebBrowser2> web_browser2;
@@ skipping 724 matching lines @@
       default: {
         NOTREACHED() << "Unexpected return from MsgWaitForMultipleObjects :"
                      << wait;
         return;
       }
     }
     now = base::Time::Now();
   }
 }