chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc - Issue 370833002: Move resource_type.* from webkit/ to content/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: chromeos fix Created 6 years, 5 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 | « chrome/browser/extensions/api/web_navigation/web_navigation_api.cc ('k') | chrome/browser/extensions/api/web_request/web_request_api.h » ('j') | content/public/common/resource_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

index e4c3e07eb535882b669517158f801440da1ad638..ffbad82ed9b9291cc6c91839f17155209f792126 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -37,6 +37,7 @@

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

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

#include "content/public/common/context_menu_params.h"

+#include "content/public/common/resource_type.h"

#include "content/public/common/url_constants.h"

#include "content/public/test/browser_test_utils.h"

#include "extensions/browser/extension_system.h"

@@ -45,8 +46,8 @@

#include "net/test/embedded_test_server/embedded_test_server.h"

#include "third_party/WebKit/public/web/WebContextMenuData.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

-#include "webkit/common/resource_type.h"

+using content::ResourceType;

using content::WebContents;

namespace extensions {