Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/captive_portal/captive_portal_tab_helper.h

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 | « android_webview/native/aw_contents_io_thread_client_impl.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.cc » ('j') | content/public/common/resource_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/captive_portal/captive_portal_tab_helper.h
diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.h b/chrome/browser/captive_portal/captive_portal_tab_helper.h
index 04175c39043249dd080a4efd43192bd070b6c628..52d5c367d35f443096dd5d133dd74d6a8e502c72 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_helper.h
+++ b/chrome/browser/captive_portal/captive_portal_tab_helper.h
@@ -14,7 +14,7 @@
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
-#include "webkit/common/resource_type.h"
+#include "content/public/common/resource_type.h"
class GURL;
class Profile;
@@ -108,7 +108,7 @@ class CaptivePortalTabHelper
// Called by Observe in response to the corresponding event.
void OnRedirect(int child_id,
- ResourceType::Type resource_type,
+ content::ResourceType::Type resource_type,
const GURL& new_url);
// Called by Observe in response to the corresponding event.
« no previous file with comments | « android_webview/native/aw_contents_io_thread_client_impl.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.cc » ('j') | content/public/common/resource_type.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698