Preview CL for adding an Infobar facility to Google Chrome Frame....

chrome_frame/bho.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 "chrome_frame/bho.h"
 
 #include <shlguid.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/win/scoped_bstr.h"
 #include "chrome_tab.h" // NOLINT
 #include "chrome_frame/crash_reporting/crash_metrics.h"
+#include "chrome_frame/ready_prompt.h"

[grt (UTC plus 2), 2010/11/10 17:59:29]

Sort.

 #include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/http_negotiate.h"
 #include "chrome_frame/metrics_service.h"
 #include "chrome_frame/protocol_sink_wrap.h"
 #include "chrome_frame/urlmon_moniker.h"
 #include "chrome_frame/utils.h"
 #include "chrome_frame/vtable_patch_manager.h"
 
 static const int kIBrowserServiceOnHttpEquivIndex = 30;
 
@@ skipping 117 matching lines @@
 }
 
 STDMETHODIMP_(void) Bho::DocumentComplete(IDispatch* dispatch, VARIANT* url) {
   DVLOG(1) << __FUNCTION__;
 
   ScopedComPtr<IWebBrowser2> web_browser2;
   if (dispatch)
     web_browser2.QueryFrom(dispatch);
 
   if (web_browser2) {
+    if (infobar_manager_ == NULL) {
+      ScopedComPtr<IServiceProvider> service_provider;

[amit, 2010/11/12 00:04:49]

Check for whether or not to show infobar is still in works, right? Also, check
out DoQueryService.

[erikwright (departed), 2010/11/24 06:24:56]

Yes. Now factored out into a separate CL.

+      if (SUCCEEDED(service_provider.QueryFrom(web_browser2))) {
+        ScopedComPtr<IOleWindow> ole_window;
+        if (SUCCEEDED(service_provider->QueryService(
+            SID_SShellBrowser, IID_IOleWindow, (void**)ole_window.Receive()))) {
+          HWND web_browserhwnd = NULL;
+          if (SUCCEEDED(ole_window->GetWindow(&web_browserhwnd)))
+            infobar_manager_.reset(new InfobarManager(web_browserhwnd));
+        }
+      }
+    }
+    if (infobar_manager_ != NULL) {
+      InfobarContent* content = new ReadyPromptContent();
+      if(!SUCCEEDED(infobar_manager_->Show(content, TOP_INFOBAR, 38))) {
+        delete content;

[grt (UTC plus 2), 2010/11/10 17:59:29]

Making callers remember to delete the instance if Show fails seems tricky.  How
about making Show take a scoped_ptr<InfobarContent>* that it release()es on
success?

[erikwright (departed), 2010/11/24 06:24:56]

It now unequivocally takes ownership upon Show.

+      }
+    }

[grt (UTC plus 2), 2010/11/10 17:59:29]

I see lots of checking for unexpected return codes here, but no logging.  How
will failures be diagnosed?

[erikwright (departed), 2010/11/24 06:24:56]

Yes. This is just a sample integration for now.

+
     VARIANT_BOOL is_top_level = VARIANT_FALSE;
     web_browser2->get_TopLevelContainer(&is_top_level);
     if (is_top_level) {
       CrashMetricsReporter::GetInstance()->IncrementMetric(
           CrashMetricsReporter::NAVIGATION_COUNT);
     }
   }
 }
 
 namespace {
@@ skipping 191 matching lines @@
   } else if (state_ == PATCH_IBROWSER) {
     vtable_patch::UnpatchInterfaceMethods(IBrowserService_PatchInfo);
     MonikerPatch::Uninitialize();
     HttpNegotiatePatch::Uninitialize();
   } else {
     HttpNegotiatePatch::Uninitialize();
   }
 
   state_ = UNKNOWN;
 }