extensions/browser/api/web_request/web_request_api.cc - Issue 584163004: Move web_request directory to //extensions.

Unified Diff: extensions/browser/api/web_request/web_request_api.cc

Issue 584163004: Move web_request directory to //extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/api/web_request/web_request_api.h ('k') | extensions/browser/api/web_request/web_request_time_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/web_request/web_request_api.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc

similarity index 99%

rename from chrome/browser/extensions/api/web_request/web_request_api.cc

rename to extensions/browser/api/web_request/web_request_api.cc

index 259d6b05946aaae20d3074bae3cfe93479ac39d9..93bc80283e21bbc243c5552bac760cfce20fe874 100644

--- a/chrome/browser/extensions/api/web_request/web_request_api.cc

+++ b/extensions/browser/api/web_request/web_request_api.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/extensions/api/web_request/web_request_api.h"

+#include "extensions/browser/api/web_request/web_request_api.h"

#include <algorithm>

@@ -16,9 +16,6 @@

#include "base/strings/utf_string_conversions.h"

#include "base/time/time.h"

#include "base/values.h"

-#include "chrome/browser/extensions/api/web_request/upload_data_presenter.h"

-#include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h"

-#include "chrome/common/extensions/api/web_request.h"

#include "content/public/browser/browser_message_filter.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_frame_host.h"

@@ -30,11 +27,13 @@

#include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"

#include "extensions/browser/api/declarative_webrequest/webrequest_rules_registry.h"

#include "extensions/browser/api/extensions_api_client.h"

+#include "extensions/browser/api/web_request/upload_data_presenter.h"

#include "extensions/browser/api/web_request/web_request_api_constants.h"

#include "extensions/browser/api/web_request/web_request_api_helpers.h"

#include "extensions/browser/api/web_request/web_request_api_utils.h"

#include "extensions/browser/api/web_request/web_request_event_router_delegate.h"

+#include "extensions/browser/api/web_request/web_request_time_tracker.h"

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_message_filter.h"

#include "extensions/browser/extension_prefs.h"

@@ -47,6 +46,7 @@

#include "extensions/browser/runtime_data.h"

#include "extensions/browser/warning_service.h"

#include "extensions/browser/warning_set.h"

+#include "extensions/common/api/web_request.h"

#include "extensions/common/error_utils.h"

#include "extensions/common/event_filtering_info.h"

#include "extensions/common/extension.h"

@@ -83,7 +83,7 @@ namespace activitylog = activity_log_web_request_constants;

namespace helpers = extension_web_request_api_helpers;

namespace utils = extension_web_request_api_utils;

namespace keys = extension_web_request_api_constants;

-namespace web_request = extensions::api::web_request;

+namespace web_request = extensions::core_api::web_request;

namespace declarative_keys = extensions::declarative_webrequest_constants;

namespace {