[Android WebView] Only send extra headers for the main page

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
+#include "android_webview/browser/aw_resource_context.h"
 #include "android_webview/common/url_constants.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "components/auto_login_parser/auto_login_parser.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_login_delegate.h"
 #include "content/public/browser/resource_request_info.h"
@@ skipping 184 matching lines @@
 
 void AwResourceDispatcherHostDelegate::RequestBeginning(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     appcache::AppCacheService* appcache_service,
     ResourceType::Type resource_type,
     int child_id,
     int route_id,
     ScopedVector<content::ResourceThrottle>* throttles) {
 
+  AddExtraHeadersIfNeeded(request, resource_context);
+
   // We always push the throttles here. Checking the existence of io_client
   // is racy when a popup window is created. That is because RequestBeginning
   // is called whether or not requests are blocked via BlockRequestForRoute()
   // however io_client may or may not be ready at the time depending on whether
   // webcontents is created.
   throttles->push_back(new IoThreadClientThrottle(
       child_id, route_id, request));
 
   // We allow intercepting only navigations within main frames. This
   // is used to post onPageStarted. We handle shouldOverrideUrlLoading
   // via a sync IPC.
   if (resource_type == ResourceType::MAIN_FRAME)
     throttles->push_back(InterceptNavigationDelegate::CreateThrottleFor(
         request));
 }
 
+void AwResourceDispatcherHostDelegate::OnRequestRedirected(
+    const GURL& redirect_url,
+    net::URLRequest* request,
+    content::ResourceContext* resource_context,
+    content::ResourceResponse* response) {
+  AddExtraHeadersIfNeeded(request, resource_context);
+}
+
+
 void AwResourceDispatcherHostDelegate::DownloadStarting(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
     int child_id,
     int route_id,
     int request_id,
     bool is_content_initiated,
     bool must_download,
     ScopedVector<content::ResourceThrottle>* throttles) {
   GURL url(request->url());
@@ skipping 145 matching lines @@
   PendingThrottleMap::iterator it = pending_throttles_.find(
       ChildRouteIDPair(new_child_id, new_route_id));
 
   if (it != pending_throttles_.end()) {
     IoThreadClientThrottle* throttle = it->second;
     throttle->OnIoThreadClientReady(new_child_id, new_route_id);
     pending_throttles_.erase(it);
   }
 }
 
+void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
+    net::URLRequest* request,
+    content::ResourceContext* resource_context) {
+  const content::ResourceRequestInfo* request_info =
+      content::ResourceRequestInfo::ForRequest(request);
+  if (!request_info) return;
+  if (request_info->GetResourceType() != ResourceType::MAIN_FRAME) return;
+
+  const bool is_load_url = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FROM_API;
+  const bool is_go_back_forward = request_info->GetPageTransition() &
+      content::PAGE_TRANSITION_FORWARD_BACK;
+  const bool is_reload = content::PageTransitionCoreTypeIs(
+      request_info->GetPageTransition(), content::PAGE_TRANSITION_RELOAD);

[bulach, 2013/12/10 15:16:57]

nit: perhaps unroll request_info->GetPageTransition()? it's called three times
here..

[mnaganov (inactive), 2013/12/10 16:00:37]

Done.

+  if (is_load_url || is_go_back_forward || is_reload) {
+    AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context);
+    std::string extra_headers = awrc->GetExtraHeaders(request->url());
+    if (!extra_headers.empty()) {
+      net::HttpRequestHeaders headers;
+      headers.AddHeadersFromString(extra_headers);
+      for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
+        request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
+      }
+    }
+  }
+}
+
 }  // namespace android_webview