Merge 75656 - If we switch into ChromeFrame as a result of a redirect then we...

chrome_frame/protocol_sink_wrap.h

 // Copyright (c) 2011 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_PROTOCOL_SINK_WRAP_H_
 #define CHROME_FRAME_PROTOCOL_SINK_WRAP_H_
 
 #include <exdisp.h>
 #include <urlmon.h>
 #include <atlbase.h>
@@ skipping 112 matching lines @@
     return referrer_;
   }
 
   bool is_attach_external_tab_request() const {
     return read_fun_ == NULL;
   }
 
   // Removes the mapping between the protocol and the ProtData.
   void Invalidate();
 
+  const std::wstring& url() const {
+    return url_;
+  }
+
  private:
   typedef std::map<IInternetProtocol*, ProtData*> ProtocolDataMap;
   static ProtocolDataMap datamap_;
   static base::Lock datamap_lock_;
 
   // Url we are retrieving. Used for RendererTypeForUrl() only.
   std::wstring url_;
   // HTTP "Referrer" header if we detect are going to switch.
   // We have to save and pass it to Chrome, so scripts can read it via DOM.
   std::string referrer_;
@@ skipping 27 matching lines @@
 };
 
 struct TransactionHooks {
   void InstallHooks();
   void RevertHooks();
 };
 
 DECLSPEC_SELECTANY struct TransactionHooks g_trans_hooks;
 
 #endif  // CHROME_FRAME_PROTOCOL_SINK_WRAP_H_