Ensure that window.open requests issued by ChromeFrame carry the correct cook...

chrome_frame/chrome_active_document.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
 #define CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
 #include <htiframe.h>
+#include <map>
 #include <mshtmcid.h>
 #include <perhist.h>
-
-#include <map>
+#include <string>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_comptr_win.h"
 #include "base/thread.h"
 
 #include "chrome_frame/chrome_frame_activex_base.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "chrome_frame/find_dialog.h"
 #include "chrome_frame/html_private_window_impl.h"
 #include "chrome_frame/html_window_impl.h"
@@ skipping 349 matching lines @@
   void OnViewSource();
   void OnDetermineSecurityZone(const GUID* cmd_group_guid, DWORD command_id,
                                DWORD cmd_exec_opt, VARIANT* in_args,
                                VARIANT* out_args);
   void OnDisplayPrivacyInfo();
 
   // Call exec on our site's command target
   HRESULT IEExec(const GUID* cmd_group_guid, DWORD command_id,
                  DWORD cmd_exec_opt, VARIANT* in_args, VARIANT* out_args);
 
-  DWORD MapUrlToZone(const wchar_t* url);
-
-  // Parses the URL and returns information whether it is a new navigation and
-  // the actual url after stripping out the cf: prefix if any.
-  // This function also checks if the url scheme is valid for navigation within
-  // chrome and whether it is a restricted URL as per IE settings. In either of
-  // these cases it returns false.
-  bool ParseUrl(const std::wstring& url, bool* is_new_navigation,
-                bool* is_chrome_protocol, std::wstring* parsed_url);
-
   // Initiates navigation to the URL passed in.
   // Returns true on success.
-  bool LaunchUrl(const std::wstring& url, const std::string& referrer,
-                 bool is_new_navigation);
+  bool LaunchUrl(const ChromeFrameUrl& cf_url, const std::string& referrer);
 
   // Handler to set the page font size in Chrome.
   HRESULT SetPageFontSize(const GUID* cmd_group_guid,
                           DWORD command_id,
                           DWORD cmd_exec_opt,
                           VARIANT* in_args,
                           VARIANT* out_args);
 
   // IOleCommandTarget handler for page refresh command
   HRESULT OnRefreshPage(const GUID* cmd_group_guid, DWORD command_id,
@@ skipping 55 matching lines @@
 
   // Contains privacy data retrieved from the UrlmonUrlRequestManager. This
   // is used to return privacy data in response to the View->Privacy policy
   // command.
   UrlmonUrlRequestManager::PrivacyInfo privacy_info_;
   UrlmonUrlRequestManager::PrivacyInfo::PrivacyRecords::iterator
       next_privacy_record_;
 
   // Dimensions of the window. Used only when opening popups.
   gfx::Rect dimensions_;
-  // Set to true if the document was loaded by a window.open in chrome.
-  bool is_new_navigation_;
  public:
   ScopedComPtr<IOleInPlaceFrame> in_place_frame_;
   OLEINPLACEFRAMEINFO frame_info_;
 };
 
 #endif  // CHROME_FRAME_CHROME_ACTIVE_DOCUMENT_H_