Merge 68951 - Added refreshing of elevation policy on first run of new versio...

ceee/ie/plugin/bho/executor.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.
 //
 // CeeeExecutor implementation
 //
 // We use interfaces named ITabWindowManager and ITabWindow
 // (documented at
 // http://www.geoffchappell.com/viewer.htm?doc=studies/windows/ie/ieframe/interfaces/itabwindowmanager.htm
 // and
@@ skipping 20 matching lines @@
 #include <mshtml.h>
 #include <wininet.h>
 
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/scoped_comptr.h"
 #include "ceee/common/com_utils.h"
 #include "ceee/common/window_utils.h"
 #include "ceee/common/windows_constants.h"
 #include "ceee/ie/common/ie_util.h"
 #include "ceee/ie/plugin/bho/frame_event_handler.h"
 #include "ceee/ie/plugin/bho/infobar_manager.h"
 #include "ceee/ie/plugin/bho/tab_window_manager.h"
 #include "ceee/ie/plugin/toolband/toolband_proxy.h"
 #include "chrome_frame/utils.h"
 
@@ skipping 112 matching lines @@
       if (SUCCEEDED(hr)) {
         CeeeWindowHandle window = static_cast<CeeeWindowHandle>(
             message_data->lParam);
         if (window) {
           hr = executor->Initialize(window);
           LOG_IF(ERROR, FAILED(hr)) << "Failed to create Executor, hr=" <<
               com::LogHr(hr);
           DCHECK(SUCCEEDED(hr)) << "CoCreating Executor. " << com::LogHr(hr);
         }
 
-        CComPtr<ICeeeBrokerRegistrar> broker;
-        hr = broker.CoCreateInstance(CLSID_CeeeBroker);
-        LOG_IF(ERROR, FAILED(hr)) << "Failed to create broker, hr=" <<
-            com::LogHr(hr);
-        DCHECK(SUCCEEDED(hr)) << "CoCreating Broker. " << com::LogHr(hr);
-
+        base::win::ScopedComPtr<ICeeeBrokerRegistrar> broker;
+        hr = StartCeeeBroker(broker.Receive());
         if (SUCCEEDED(hr)) {
           hr = broker->RegisterWindowExecutor(::GetCurrentThreadId(), executor);
           DCHECK(SUCCEEDED(hr)) << "Registering Executor. " << com::LogHr(hr);
         }
       }
       return 0;
     }
   }
   return ::CallNextHookEx(NULL, code, wparam, lparam);
 }
@@ skipping 821 matching lines @@
 
 STDMETHODIMP CeeeExecutor::OnTopFrameBeforeNavigate(BSTR url) {
   DCHECK(infobar_manager_ != NULL) << "infobar_manager_ is not initialized";
   if (infobar_manager_ == NULL)
     return E_FAIL;
 
   // According to the specification, tab navigation closes the infobar.
   infobar_manager_->HideAll();
   return S_OK;
 }