Change Lo-Fi bool to bitmask to support multiple Previews types

content/common/navigation_params.cc

 // Copyright 2014 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 "content/common/navigation_params.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/public/common/appcache_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/previews_state.h"

[nasko, 2016/12/12 23:05:41]

Why was this include removed? It is needed for PreviewsState, isn't it? We
should not depend on transitive includes.

[megjablon, 2016/12/14 01:10:32]

Sorry didn't see these comments before. It was added to the .h

 #include "content/public/common/url_constants.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace content {
 
 // PlzNavigate
 bool ShouldMakeNetworkRequestForURL(const GURL& url) {
   CHECK(IsBrowserSideNavigationEnabled());
 
   // Javascript URLs, about:blank, srcdoc should not send a request
   // to the network stack.
   // TODO(clamy): same document navigations should not send requests to the
   // network stack. Neither should pushState/popState.
   return url != url::kAboutBlankURL && !url.SchemeIs(url::kJavaScriptScheme) &&
          !url.is_empty() && !url.SchemeIs(url::kContentIDScheme) &&
          url != content::kAboutSrcDocURL;
 }
 
 CommonNavigationParams::CommonNavigationParams()
     : transition(ui::PAGE_TRANSITION_LINK),
       navigation_type(FrameMsg_Navigate_Type::NORMAL),
       gesture(NavigationGestureUnknown),
       allow_download(true),
       should_replace_current_entry(false),
       report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT),
-      lofi_state(LOFI_UNSPECIFIED),
+      previews_state(PREVIEWS_UNSPECIFIED),
       navigation_start(base::TimeTicks::Now()),
       method("GET") {}
 
 CommonNavigationParams::CommonNavigationParams(
     const GURL& url,
     const Referrer& referrer,
     ui::PageTransition transition,
     FrameMsg_Navigate_Type::Value navigation_type,
     NavigationGesture gesture,
     bool allow_download,
     bool should_replace_current_entry,
     base::TimeTicks ui_timestamp,
     FrameMsg_UILoadMetricsReportType::Value report_type,
     const GURL& base_url_for_data_url,
     const GURL& history_url_for_data_url,
-    LoFiState lofi_state,
+    int previews_state,
     const base::TimeTicks& navigation_start,
     std::string method,
     const scoped_refptr<ResourceRequestBodyImpl>& post_data)
     : url(url),
       referrer(referrer),
       transition(transition),
       navigation_type(navigation_type),
       gesture(gesture),
       allow_download(allow_download),
       should_replace_current_entry(should_replace_current_entry),
       ui_timestamp(ui_timestamp),
       report_type(report_type),
       base_url_for_data_url(base_url_for_data_url),
       history_url_for_data_url(history_url_for_data_url),
-      lofi_state(lofi_state),
+      previews_state(previews_state),
       navigation_start(navigation_start),
       method(method),
       post_data(post_data) {
   // |method != "POST"| should imply absence of |post_data|.
   if (method != "POST" && post_data) {
     NOTREACHED();
     this->post_data = nullptr;
   }
 }
 
@@ skipping 105 matching lines @@
     const RequestNavigationParams& request_params)
     : common_params(common_params),
       start_params(start_params),
       request_params(request_params) {
 }
 
 NavigationParams::~NavigationParams() {
 }
 
 }  // namespace content