Remove includes of message headers in headers.

chrome_frame/chrome_active_document.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.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 16 matching lines @@
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_variant.h"
 #include "base/win/win_util.h"
 #include "grit/generated_resources.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
 #include "chrome_frame/buggy_bho_handling.h"
 #include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/utils.h"
 
 DEFINE_GUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0,
             0x46);
 
 base::ThreadLocalPointer<ChromeActiveDocument> g_active_doc_cache;
 
 bool g_first_launch_by_process_ = true;
 
 const DWORD kIEEncodingIdArray[] = {
 #define DEFINE_ENCODING_ID_ARRAY(encoding_name, id, chrome_name) encoding_name,
   INTERNAL_IE_ENCODINGMENU_IDS(DEFINE_ENCODING_ID_ARRAY)
 #undef DEFINE_ENCODING_ID_ARRAY
   0  // The Last data must be 0 to indicate the end of the encoding id array.
 };
 
 ChromeActiveDocument::ChromeActiveDocument()
-    : first_navigation_(true),
+    : navigation_info_(new NavigationInfo()),
+      first_navigation_(true),
       is_automation_client_reused_(false),
       popup_allowed_(false),
       accelerator_table_(NULL) {
   TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, "");
 
   url_fetcher_->set_frame_busting(false);
-  memset(&navigation_info_, 0, sizeof(navigation_info_));
+  memset(navigation_info_.get(), 0, sizeof(NavigationInfo));
 }
 
 HRESULT ChromeActiveDocument::FinalConstruct() {
   // If we have a cached ChromeActiveDocument instance in TLS, then grab
   // ownership of the cached document's automation client. This is an
   // optimization to get Chrome active documents to load faster.
   ChromeActiveDocument* cached_document = g_active_doc_cache.Get();
   if (cached_document && cached_document->IsValid()) {
     SetResourceModule();
     DCHECK(automation_client_.get() == NULL);
@@ skipping 343 matching lines @@
   // Back-Forward navigation to anchors to work correctly when we navigate to a
   // page outside of ChromeFrame and then come back.
   if (!stream) {
     NOTREACHED();
     return E_INVALIDARG;
   }
 
   LARGE_INTEGER offset = {0};
   ULARGE_INTEGER new_pos = {0};
   DWORD written = 0;
-  std::wstring url = UTF8ToWide(navigation_info_.url.spec());
+  std::wstring url = UTF8ToWide(navigation_info_->url.spec());
   return stream->Write(url.c_str(), (url.length() + 1) * sizeof(wchar_t),
                        &written);
 }
 
 STDMETHODIMP ChromeActiveDocument::SetPositionCookie(DWORD position_cookie) {
   if (automation_client_.get()) {
     int index = static_cast<int>(position_cookie);
-    navigation_info_.navigation_index = index;
+    navigation_info_->navigation_index = index;
     automation_client_->NavigateToIndex(index);
   } else {
     DLOG(WARNING) << "Invalid automation client instance";
   }
   return S_OK;
 }
 
 STDMETHODIMP ChromeActiveDocument::GetPositionCookie(DWORD* position_cookie) {
   if (!position_cookie)
     return E_INVALIDARG;
 
-  *position_cookie = navigation_info_.navigation_index;
+  *position_cookie = navigation_info_->navigation_index;
   return S_OK;
 }
 
 STDMETHODIMP ChromeActiveDocument::GetUrlForEvents(BSTR* url) {
   if (NULL == url)
     return E_POINTER;
   *url = ::SysAllocString(url_);
   return S_OK;
 }
 
@@ skipping 238 matching lines @@
   // Close the container window.
   ScopedComPtr<IWebBrowser2> web_browser2;
   DoQueryService(SID_SWebBrowserApp, m_spClientSite, web_browser2.Receive());
   if (web_browser2)
     web_browser2->Quit();
 }
 
 void ChromeActiveDocument::UpdateNavigationState(
     const NavigationInfo& new_navigation_info, int flags) {
   HRESULT hr = S_OK;
-  bool is_title_changed = (navigation_info_.title != new_navigation_info.title);
+  bool is_title_changed =
+      (navigation_info_->title != new_navigation_info.title);
   bool is_ssl_state_changed =
-      (navigation_info_.security_style != new_navigation_info.security_style) ||
-      (navigation_info_.displayed_insecure_content !=
+      (navigation_info_->security_style !=
+          new_navigation_info.security_style) ||
+      (navigation_info_->displayed_insecure_content !=
           new_navigation_info.displayed_insecure_content) ||
-      (navigation_info_.ran_insecure_content !=
+      (navigation_info_->ran_insecure_content !=
           new_navigation_info.ran_insecure_content);
 
   if (is_ssl_state_changed) {
     int lock_status = SECURELOCK_SET_UNSECURE;
     switch (new_navigation_info.security_style) {
       case SECURITY_STYLE_AUTHENTICATED:
         lock_status = new_navigation_info.displayed_insecure_content ?
             SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT;
         break;
       default:
@@ skipping 98 matching lines @@
   if (is_title_changed) {
     base::win::ScopedVariant title(new_navigation_info.title.c_str());
     IEExec(NULL, OLECMDID_SETTITLE, OLECMDEXECOPT_DONTPROMPTUSER,
            title.AsInput(), NULL);
   }
 
   // It is important that we only update the navigation_info_ after we have
   // finalized the travel log. This is because IE will ask for information
   // such as navigation index when the travel log is finalized and we need
   // supply the old index and not the new one.
-  navigation_info_ = new_navigation_info;
+  *navigation_info_ = new_navigation_info;
   // Update the IE zone here. Ideally we would like to do it when the active
   // document is activated. However that does not work at times as the frame we
   // get there is not the actual frame which handles the command.
   IEExec(&CGID_Explorer, SBCMDID_MIXEDZONE, 0, NULL, NULL);
 }
 
 void ChromeActiveDocument::OnFindInPage() {
   TabProxy* tab = GetTabProxy();
   if (tab) {
     if (!find_dialog_.IsWindow())
       find_dialog_.Create(m_hWnd);
 
     find_dialog_.ShowWindow(SW_SHOW);
   }
 }
 
 void ChromeActiveDocument::OnViewSource() {
-  DCHECK(navigation_info_.url.is_valid());
+  DCHECK(navigation_info_->url.is_valid());
   HostNavigate(GURL(chrome::kViewSourceScheme + std::string(":") +
-      navigation_info_.url.spec()), GURL(), NEW_WINDOW);
+      navigation_info_->url.spec()), GURL(), NEW_WINDOW);
 }
 
 void ChromeActiveDocument::OnDetermineSecurityZone(const GUID* cmd_group_guid,
                                                    DWORD command_id,
                                                    DWORD cmd_exec_opt,
                                                    VARIANT* in_args,
                                                    VARIANT* out_args) {
   // Always return URLZONE_INTERNET since that is the Chrome's behaviour.
   // Correct step is to use MapUrlToZone().
   if (out_args != NULL) {
@@ skipping 250 matching lines @@
     tab_proxy->ReloadAsync();
   } else {
     DLOG(ERROR) << "No automation proxy";
     DCHECK(automation_client_.get() != NULL) << "how did it get freed?";
     // The current url request manager (url_fetcher_) has been switched to
     // a stopping state so we need to reset it and get a new one for the new
     // automation server.
     ResetUrlRequestManager();
     url_fetcher_->set_frame_busting(false);
     // And now launch the current URL again.  This starts a new server process.
-    DCHECK(navigation_info_.url.is_valid());
+    DCHECK(navigation_info_->url.is_valid());
     ChromeFrameUrl cf_url;
-    cf_url.Parse(UTF8ToWide(navigation_info_.url.spec()));
-    LaunchUrl(cf_url, navigation_info_.referrer.spec());
+    cf_url.Parse(UTF8ToWide(navigation_info_->url.spec()));
+    LaunchUrl(cf_url, navigation_info_->referrer.spec());
   }
 
   return S_OK;
 }
 
 HRESULT ChromeActiveDocument::SetPageFontSize(const GUID* cmd_group_guid,
                                               DWORD command_id,
                                               DWORD cmd_exec_opt,
                                               VARIANT* in_args,
                                               VARIANT* out_args) {
@@ skipping 234 matching lines @@
   //    navigation was initiated on the current external tab.
   // 3. The navigation type has changed.
   // 4. The url or the referrer are different.
   if (flags == TabContents::INVALIDATE_LOAD)
     return false;
 
   if (new_navigation_info.navigation_index <= 0)
     return false;
 
   if (new_navigation_info.navigation_index ==
-      navigation_info_.navigation_index)
+      navigation_info_->navigation_index)
     return false;
 
-  if (new_navigation_info.navigation_type != navigation_info_.navigation_type)
+  if (new_navigation_info.navigation_type != navigation_info_->navigation_type)
     return true;
 
-  if (new_navigation_info.url != navigation_info_.url)
+  if (new_navigation_info.url != navigation_info_->url)
     return true;
 
-  if (new_navigation_info.referrer != navigation_info_.referrer)
+  if (new_navigation_info.referrer != navigation_info_->referrer)
     return true;
 
   return false;
 }