Merge 8764 - Add support for UA spoofing, and spoof Safari's UA string when l...

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 #include <string>
 #include <vector>
 
 #pragma warning(push, 0)
 #include "Chrome.h"
@@ skipping 1244 matching lines @@
   //
   // e.g.:
   // WebHistoryItem* item =
   // webframe_->webview_impl()->GetBackForwardList()->GetCurrentItem();
   // WebHistoryItemImpl* item_impl = static_cast<WebHistoryItemImpl*>(item);
   //
   // item_impl->SetTitle(webkit_glue::StringToStdWString(title));
 }
 
 String WebFrameLoaderClient::userAgent(const KURL& url) {
-  return webkit_glue::StdStringToString(webkit_glue::GetUserAgent());
+  return webkit_glue::StdStringToString(
+      webkit_glue::GetUserAgent(webkit_glue::KURLToGURL(url)));
 }
 
 void WebFrameLoaderClient::savePlatformDataToCachedPage(WebCore::CachedPage*) {
   NOTREACHED() << "Page cache should be disabled";
 }
 
 void WebFrameLoaderClient::transitionToCommittedFromCachedPage(WebCore::CachedPage*) {
   ASSERT_NOT_REACHED();
 }
 
@@ skipping 232 matching lines @@
     return false;
 
   DCHECK(disposition);
   if (middle_or_ctrl)
     *disposition = shift ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   else
     *disposition = shift ? NEW_WINDOW : SAVE_TO_DISK;
   return true;
 }